1 |
commit: c63a11ad71c189878ec35f679718aa5995dd5605 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 21 18:47:34 2022 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 24 08:20:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63a11ad |
7 |
|
8 |
dev-libs/gjs: drop redundant patch file |
9 |
|
10 |
Fixes: a0d230f8213c4a0a21661a315e637d80a3718e3d |
11 |
Bug: https://bugs.gentoo.org/831580 |
12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
|
15 |
dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch | 76 ------------------------ |
16 |
1 file changed, 76 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch |
19 |
deleted file mode 100644 |
20 |
index 9a051131d98c..000000000000 |
21 |
--- a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch |
22 |
+++ /dev/null |
23 |
@@ -1,76 +0,0 @@ |
24 |
-From 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19 Mon Sep 17 00:00:00 2001 |
25 |
-From: Jan Beich <jbeich@×××××××.org> |
26 |
-Date: Sat, 27 Nov 2021 22:57:11 +0000 |
27 |
-Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 |
28 |
- |
29 |
-meson.build:580:0: ERROR: "install_dir" must be specified when installing a target |
30 |
-installed-tests/js/meson.build:73:0: ERROR: "install_dir" must be specified when installing a target |
31 |
-installed-tests/js/meson.build:91:4: ERROR: "install_dir" must be specified when installing a target |
32 |
-installed-tests/js/meson.build:104:0: ERROR: "install_dir" must be specified when installing a target |
33 |
-installed-tests/js/libgjstesttools/meson.build:13:0: ERROR: "install_dir" must be specified when installing a target |
34 |
---- |
35 |
- installed-tests/js/libgjstesttools/meson.build | 2 +- |
36 |
- installed-tests/js/meson.build | 6 +++--- |
37 |
- meson.build | 2 +- |
38 |
- 3 files changed, 5 insertions(+), 5 deletions(-) |
39 |
- |
40 |
-diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build |
41 |
-index 2e57483a..3ca4d7ed 100644 |
42 |
---- a/installed-tests/js/libgjstesttools/meson.build |
43 |
-+++ b/installed-tests/js/libgjstesttools/meson.build |
44 |
-@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools, |
45 |
- includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources, |
46 |
- namespace: 'GjsTestTools', nsversion: '1.0', |
47 |
- symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error', |
48 |
-- install: get_option('installed_tests'), install_dir_gir: false, |
49 |
-+ install: get_option('installed_tests'), install_dir_gir: [false], |
50 |
- install_dir_typelib: installed_tests_execdir) |
51 |
- gjstest_tools_typelib = gjstest_tools_gir[1] |
52 |
- libgjstesttools_dep = declare_dependency( |
53 |
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build |
54 |
-index 2f007351..16b59660 100644 |
55 |
---- a/installed-tests/js/meson.build |
56 |
-+++ b/installed-tests/js/meson.build |
57 |
-@@ -74,7 +74,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 |
-@@ -91,7 +91,7 @@ if not skip_warnlib |
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 |
- endif |
75 |
-@@ -105,7 +105,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 437b3fd3..73d0eaca 100644 |
86 |
---- a/meson.build |
87 |
-+++ b/meson.build |
88 |
-@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, |
89 |
- includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, |
90 |
- namespace: 'GjsPrivate', 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 ############################################## |
97 |
--- |
98 |
-GitLab |
99 |
- |