| 1 |
commit: 034143b2d5bb6d7e10b0dfede0bc129528f472bf |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 29 00:55:07 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 29 00:55:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034143b2 |
| 7 |
|
| 8 |
gnome-extra/cjs: backport fix for meson-0.60.2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/827482 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
gnome-extra/cjs/cjs-5.0.1.ebuild | 4 ++ |
| 14 |
gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch | 58 ++++++++++++++++++++++ |
| 15 |
2 files changed, 62 insertions(+) |
| 16 |
|
| 17 |
diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild |
| 18 |
index e5929ee91601..e5de6fa9f569 100644 |
| 19 |
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild |
| 20 |
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild |
| 21 |
@@ -39,6 +39,10 @@ BDEPEND=" |
| 22 |
virtual/pkgconfig |
| 23 |
" |
| 24 |
|
| 25 |
+PATCHES=( |
| 26 |
+ "${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch" |
| 27 |
+) |
| 28 |
+ |
| 29 |
src_prepare() { |
| 30 |
default |
| 31 |
python_fix_shebang build |
| 32 |
|
| 33 |
diff --git a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch |
| 34 |
new file mode 100644 |
| 35 |
index 000000000000..1ce4eef2abb2 |
| 36 |
--- /dev/null |
| 37 |
+++ b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch |
| 38 |
@@ -0,0 +1,58 @@ |
| 39 |
+From 61823ced59db5ce7a4223ce2759f3da52d83a0de Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Jan Beich <jbeich@×××××××.org> |
| 41 |
+Date: Sat, 27 Nov 2021 23:21:56 +0000 |
| 42 |
+Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 |
| 43 |
+ |
| 44 |
+meson.build:541:0: ERROR: "install_dir" must be specified when installing a target |
| 45 |
+installed-tests/js/meson.build:47:0: ERROR: "install_dir" must be specified when installing a target |
| 46 |
+installed-tests/js/meson.build:66:0: ERROR: "install_dir" must be specified when installing a target |
| 47 |
+installed-tests/js/meson.build:81:0: ERROR: "install_dir" must be specified when installing a target |
| 48 |
+--- |
| 49 |
+ installed-tests/js/meson.build | 6 +++--- |
| 50 |
+ meson.build | 2 +- |
| 51 |
+ 2 files changed, 4 insertions(+), 4 deletions(-) |
| 52 |
+ |
| 53 |
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build |
| 54 |
+index d3125a7c..564124f2 100644 |
| 55 |
+--- a/installed-tests/js/meson.build |
| 56 |
++++ b/installed-tests/js/meson.build |
| 57 |
+@@ -48,7 +48,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes, |
| 58 |
+ sources: regress_sources, namespace: 'Regress', nsversion: '1.0', |
| 59 |
+ identifier_prefix: 'Regress', symbol_prefix: 'regress_', |
| 60 |
+ extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args, |
| 61 |
+- install: get_option('installed_tests'), install_dir_gir: false, |
| 62 |
++ install: get_option('installed_tests'), install_dir_gir: [false], |
| 63 |
+ install_dir_typelib: installed_tests_execdir) |
| 64 |
+ regress_typelib = regress_gir[1] |
| 65 |
+ |
| 66 |
+@@ -66,7 +66,7 @@ libwarnlib = library('warnlib', warnlib_sources, |
| 67 |
+ warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'], |
| 68 |
+ sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0', |
| 69 |
+ symbol_prefix: 'warnlib_', header: 'warnlib.h', |
| 70 |
+- install: get_option('installed_tests'), install_dir_gir: false, |
| 71 |
++ install: get_option('installed_tests'), install_dir_gir: [false], |
| 72 |
+ install_dir_typelib: installed_tests_execdir) |
| 73 |
+ warnlib_typelib = warnlib_gir[1] |
| 74 |
+ |
| 75 |
+@@ -82,7 +82,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests, |
| 76 |
+ includes: ['Gio-2.0'], sources: gimarshallingtests_sources, |
| 77 |
+ namespace: 'GIMarshallingTests', nsversion: '1.0', |
| 78 |
+ symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error', |
| 79 |
+- install: get_option('installed_tests'), install_dir_gir: false, |
| 80 |
++ install: get_option('installed_tests'), install_dir_gir: [false], |
| 81 |
+ install_dir_typelib: installed_tests_execdir) |
| 82 |
+ gimarshallingtests_typelib = gimarshallingtests_gir[1] |
| 83 |
+ |
| 84 |
+diff --git a/meson.build b/meson.build |
| 85 |
+index aa55addc..43ba4af1 100644 |
| 86 |
+--- a/meson.build |
| 87 |
++++ b/meson.build |
| 88 |
+@@ -542,7 +542,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, |
| 89 |
+ includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, |
| 90 |
+ namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs', |
| 91 |
+ symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true, |
| 92 |
+- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0') |
| 93 |
++ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0') |
| 94 |
+ gjs_private_typelib = gjs_private_gir[1] |
| 95 |
+ |
| 96 |
+ ### Build gjs-console interpreter ############################################## |
Archives