[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/

["Sam James" <sam@gentoo.org>]

commit:     eb6057d7b8b7a5ec13894baa8649754aaa5f9465
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 19 00:26:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 00:26:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6057d7

gnome-base/gnome-control-center: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831435
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-base/gnome-control-center/Manifest                         | 1 +
 gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 725be6ee884c..8c7ce8d55955 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -2,5 +2,6 @@ DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2
 DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9
 DIST gnome-control-center-40.7-patchset.tar.xz 7232 BLAKE2B bdf97bd666dcdd8cf87e1a553b849b42e3e1713e508e22450073ea8c4849a7086fc8f5effde39c939e0b8c26decadf9056fb93cfcb530fe287b0039c322fd989 SHA512 cbd7e7ca734ad49fd343f0d5d21c5153ba48ebedcd58ed225c7f196b0c79167f769609803f5752585e43edd7649ac73fe3ed1d9264e3d103107a9f5b4b091058
 DIST gnome-control-center-40.7.tar.xz 6473212 BLAKE2B 94a97297857ebdf8dcc9c4a45f64cabbc7e2210cf0cce00174c016290c17393c9c6b73073873c8fb9917ca4ed9f18c20947730127e3ad7ed4658a2bf3d99ede5 SHA512 2a5235b8659fa72521b50fb05bb4c2daceac88ea127492ea7cb544da1831370faa3c70c98b1a25e314121d85f82aa8f606c8c6f3a082d577ba5cf85b14d1cc48
+DIST gnome-control-center-41.2-meson-0.61-build.patch.bz2 2356 BLAKE2B c739cb6e0ce181a4724aafc5996469f92ac85e89d6673fa6f3c051e0db0b8c2280c57c5a07fae35318a8d5e407b377a47d5a93e86071a79eb2ff44274919ebd3 SHA512 8f78444e275f5e89ee041ccb13887427cba7d19c456347dea9fb20f66b6a29f5d89b049487b402bb62886e29d43c22f2019dba770cbb4c7bd7fd568e9efb3f06
 DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27
 DIST gnome-control-center-41.2.tar.xz 6619180 BLAKE2B 1ddc68b87482d66f093f72690d287691dce6e02b071878e1facb33a646e7b487a75ba04b8ec18bb6e717a8c6c27a393bf0dd30fcb371ae833edd18c6e645bad3 SHA512 9ea19e4bd1bd708f78a62c746102467dd2e801b84a64589a043a4f849d297353edc54291a5c59db1f8dd3c2c24088aec0f1d98a6270b0373384a2e19e7dde332

diff --git a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
index 94d95e29285e..6843ae5bfd33 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-41.2.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
@@ -9,6 +9,7 @@ inherit gnome.org gnome2-utils meson python-any-r1 xdg
 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
 SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PF}-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61-build.patch.bz2"
 
 LICENSE="GPL-2+"
 SLOT="2"
@@ -124,6 +125,9 @@ PATCHES=(
 	# https://bugzilla.gnome.org/686840, 697478, 700145
 	# Fix some absolute paths to be appropriate for Gentoo
 	"${WORKDIR}"/patches/
+
+	# bug #831435
+	"${WORKDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {