| 1 |
commit: 28fe1228ccd031ed24a996f9e8b86f2ebe16b375 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 18 22:32:17 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 18 22:32:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fe1228 |
| 7 |
|
| 8 |
app-crypt/gcr: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831428 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../gcr/files/gcr-3.40.0-meson-0.61-build.patch | 47 ++++++++++++++++++++++ |
| 14 |
app-crypt/gcr/gcr-3.40.0.ebuild | 3 +- |
| 15 |
2 files changed, 49 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..4bf8efbb1d73 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch |
| 22 |
@@ -0,0 +1,47 @@ |
| 23 |
+https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch |
| 24 |
+https://bugs.gentoo.org/831428 |
| 25 |
+ |
| 26 |
+From: Jakub Jirutka <jakub@×××××××.cz> |
| 27 |
+Date: Wed, 12 Jan 2022 00:24:20 +0100 |
| 28 |
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir |
| 29 |
+ |
| 30 |
+This argument has been removed in Meson 0.61.0: |
| 31 |
+ |
| 32 |
+ gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" |
| 33 |
+ |
| 34 |
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: |
| 35 |
+ |
| 36 |
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. |
| 37 |
+ |
| 38 |
+Fixes #89 |
| 39 |
+--- a/gck/meson.build |
| 40 |
++++ b/gck/meson.build |
| 41 |
+@@ -131,7 +131,6 @@ if get_option('introspection') |
| 42 |
+ sources: gck_gir_sources, |
| 43 |
+ namespace: 'Gck', |
| 44 |
+ nsversion: '@0@'.format(gck_major_version), |
| 45 |
+- packages: gck_deps, |
| 46 |
+ export_packages: 'gck-@0@'.format(gck_major_version), |
| 47 |
+ includes: [ 'GObject-2.0', 'Gio-2.0' ], |
| 48 |
+ header: 'gck/gck.h', |
| 49 |
+--- a/gcr/meson.build |
| 50 |
++++ b/gcr/meson.build |
| 51 |
+@@ -190,7 +190,6 @@ if get_option('introspection') |
| 52 |
+ sources: [ gcr_base_public_sources, gcr_base_headers ], |
| 53 |
+ namespace: 'Gcr', |
| 54 |
+ nsversion: '@0@'.format(gcr_major_version), |
| 55 |
+- packages: gcr_base_deps, |
| 56 |
+ export_packages: 'gcr-base-@0@'.format(gcr_major_version), |
| 57 |
+ includes: [ |
| 58 |
+ 'GObject-2.0', |
| 59 |
+--- a/ui/meson.build |
| 60 |
++++ b/ui/meson.build |
| 61 |
+@@ -152,7 +152,6 @@ if get_option('introspection') |
| 62 |
+ export_packages: 'gcr-ui-@0@'.format(gcr_major_version), |
| 63 |
+ identifier_prefix: 'Gcr', |
| 64 |
+ symbol_prefix: 'gcr', |
| 65 |
+- packages: gcr_ui_deps, |
| 66 |
+ includes: [ |
| 67 |
+ 'GObject-2.0', |
| 68 |
+ 'Gio-2.0', |
| 69 |
+GitLab |
| 70 |
|
| 71 |
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild |
| 72 |
index 44c233571e9d..3a367dc36429 100644 |
| 73 |
--- a/app-crypt/gcr/gcr-3.40.0.ebuild |
| 74 |
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2021 Gentoo Authors |
| 77 |
+# Copyright 1999-2022 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=7 |
| 81 |
@@ -46,6 +46,7 @@ BDEPEND=" |
| 82 |
|
| 83 |
PATCHES=( |
| 84 |
"${FILESDIR}"/3.38.0-optional-vapi.patch |
| 85 |
+ "${FILESDIR}"/${P}-meson-0.61-build.patch |
| 86 |
) |
| 87 |
|
| 88 |
pkg_setup() { |
Archives