diff options
Diffstat (limited to 'gnome-base/dconf-editor')
-rw-r--r-- | gnome-base/dconf-editor/Manifest | 3 | ||||
-rw-r--r-- | gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild | 6 | ||||
-rw-r--r-- | gnome-base/dconf-editor/files/meson-0.61.patch | 36 |
3 files changed, 43 insertions, 2 deletions
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest index 77c7fc350fa4..2747bda12acb 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,3 +1,4 @@ +AUX meson-0.61.patch 921 BLAKE2B d05988ee5c86a22c64c296f76f16a8f1fd69484652bcd1f8e5fc0bcb0b7b091edc1d4322c5925b3beb7f66a599e0446e486debcee206dd5e40da1a478b28be2f SHA512 f92b5b32b36285c61503fc184976921e72b1255bf96b17a53c87e77164a81f71012feb38c0e5bfb4934fb557f0e4d557b5d4dd6c686e4da74e595046f380fddd DIST dconf-editor-3.38.3.tar.xz 594544 BLAKE2B 0455fc01be96bccec9a9799c5bf23e9fe58cb34d32899a119753f58f5bc2f03acb96ff0eeba131cd8c0ea130e3afad16e4fadb23601510b618bf7a3d5a1664a3 SHA512 cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1 -EBUILD dconf-editor-3.38.3.ebuild 820 BLAKE2B f6f3cefda9ae34ee3c1096231adad15f3f334274b195d6279e9137d1a57898316aaa274dffd709e480a60c279425785953d4910d54199a387a8ee6f19636062d SHA512 3897fdacd92e5afd01fab0a2fd9b3f69fc357ed0724d800608b5a0c315e4609291df406e3bd9b5d02a72c935a1079224ad504384862ca6a7bd05ff5ad72fa1d8 +EBUILD dconf-editor-3.38.3.ebuild 865 BLAKE2B 63c98e66d2547661d2b7eae22976f522269467024c5a7368f481aeefe9917c654c933067fedf2e5f79c24c5a8863deee52969b27a4d368aad0d7a89e70bd300c SHA512 13e1f32a055be2974d700f30620d8d52a573ce25e67428624e937676504f7f929a4affa3bf22ead4f506894a07183b86d1e3588f0ad96ae8f1085e387458d04d MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild index ad7847c009a7..dabf7da33d8f 100644 --- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild +++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,6 +27,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/meson-0.61.patch" +) + src_prepare() { vala_src_prepare xdg_src_prepare diff --git a/gnome-base/dconf-editor/files/meson-0.61.patch b/gnome-base/dconf-editor/files/meson-0.61.patch new file mode 100644 index 000000000000..caa1806d5779 --- /dev/null +++ b/gnome-base/dconf-editor/files/meson-0.61.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/831746 +https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21 + +From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 21 Jan 2022 22:22:58 +0100 +Subject: [PATCH] editor/meson.build: fix meson 0.61 errors + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + editor/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/editor/meson.build b/editor/meson.build +index 4c89ab99..0eb3bb1a 100644 +--- a/editor/meson.build ++++ b/editor/meson.build +@@ -1,7 +1,6 @@ + desktop = dconf_editor_namespace + '.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -26,7 +25,6 @@ configure_file( + appdata = dconf_editor_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + |