Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/
Date: Mon, 28 Mar 2022 05:50:18
Message-Id: 1648446599.c8bc7034409f8a1adb184dff243d84a77766a37a.ionen@gentoo
1 commit: c8bc7034409f8a1adb184dff243d84a77766a37a
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 05:47:35 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 05:49:59 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bc7034
7
8 Revert "games-kids/gmult: fix build with meson-0.61.4"
9
10 This reverts commit 19102942b5d6049be39126e08436fd9e49dbc8e1.
11
12 This workaround won't be necessary, turns out cache updates are
13 skipped when DESTDIR is used and the failing dependency check was
14 due to a typo in meson-0.61.4 (fixed in -r1, thanks sam).
15
16 Bug: https://bugs.gentoo.org/836294
17 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
18
19 games-kids/gmult/files/gmult-10.0-no-icon-cache.patch | 8 --------
20 games-kids/gmult/gmult-10.0.ebuild | 4 ----
21 2 files changed, 12 deletions(-)
22
23 diff --git a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch b/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
24 deleted file mode 100644
25 index 2a355c17e228..000000000000
26 --- a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
27 +++ /dev/null
28 @@ -1,8 +0,0 @@
29 -https://bugs.gentoo.org/836294
30 ---- a/data/meson.build
31 -+++ b/data/meson.build
32 -@@ -56,3 +56,3 @@
33 - gnome.post_install(
34 -- gtk_update_icon_cache: true,
35 -+ gtk_update_icon_cache: false,
36 - )
37
38 diff --git a/games-kids/gmult/gmult-10.0.ebuild b/games-kids/gmult/gmult-10.0.ebuild
39 index b0c8fcd25418..6df28b33de33 100644
40 --- a/games-kids/gmult/gmult-10.0.ebuild
41 +++ b/games-kids/gmult/gmult-10.0.ebuild
42 @@ -26,10 +26,6 @@ BDEPEND="
43 $(vala_depend)
44 sys-devel/gettext"
45
46 -PATCHES=(
47 - "${FILESDIR}"/${PN}-10.0-no-icon-cache.patch
48 -)
49 -
50 DOCS=( NEWS.md README.md )
51
52 src_configure() {