public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gjs: 1.64.4 -> 1.66.0

Browse Source 
- Installed tests execdir was moved: https://gitlab.gnome.org/GNOME/gjs/-/issues/318

Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.1.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.2.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.3.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.4.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.90.news
    - libsysprof-capture-4 ← libsysprof-capture-3
        - We did not depend on it previously either.
    - SpiderMonkey 78
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.91.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.92.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.0.news

Changes reviewed by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Doron Behar
2020-10-24 01:14:24 +02:00
committed by Jan Tojnar
parent cdc3ce564d
commit dde31ed48e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gjs/installed-tests-path.patch
+6 -6
View File
@@ -1,22 +1,22 @@
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 7e842025..1e5029e0 100644
index 04c7910f..9647908c 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,7 +1,7 @@
### Installed tests ############################################################
-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests'
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
# Simple shell script tests #
diff --git a/meson.build b/meson.build
index 084d5396..e5d73fcd 100644
index 9ab29475..42ffe07f 100644
--- a/meson.build
+++ b/meson.build
@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp',
@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
install_dir: get_option('datadir') / api_name / 'lsan')
if get_option('installed_tests')
@@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644
meson.add_install_script('build/compile-gschemas.py', schemadir)
endif
diff --git a/meson_options.txt b/meson_options.txt
index 66f66024..008687cb 100644
index 825ba77a..21f0323c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,