[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit:     19102942b5d6049be39126e08436fd9e49dbc8e1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 04:15:03 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 04:20:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19102942

games-kids/gmult: fix build with meson-0.61.4

meson-0.61.4's gnome module now checks that gtk4-update-icon-cache is
available if updating cache is requested (was ignored with <=0.61.3),
simply skip given this should be handled by xdg.eclass either way.

Closes: https://bugs.gentoo.org/836294
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-kids/gmult/files/gmult-10.0-no-icon-cache.patch | 8 ++++++++
 games-kids/gmult/gmult-10.0.ebuild                    | 4 ++++
 2 files changed, 12 insertions(+)

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
new file mode 100644
index 000000000000..2a355c17e228
--- /dev/null
+++ b/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/836294
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,3 +56,3 @@
+ gnome.post_install(
+-    gtk_update_icon_cache: true,
++    gtk_update_icon_cache: false,
+ )

diff --git a/games-kids/gmult/gmult-10.0.ebuild b/games-kids/gmult/gmult-10.0.ebuild
index 6df28b33de33..b0c8fcd25418 100644
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ b/games-kids/gmult/gmult-10.0.ebuild
@@ -26,6 +26,10 @@ BDEPEND="
 	$(vala_depend)
 	sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0-no-icon-cache.patch
+)
+
 DOCS=( NEWS.md README.md )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit:     c8bc7034409f8a1adb184dff243d84a77766a37a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 05:47:35 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 05:49:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bc7034

Revert "games-kids/gmult: fix build with meson-0.61.4"

This reverts commit 19102942b5d6049be39126e08436fd9e49dbc8e1.

This workaround won't be necessary, turns out cache updates are
skipped when DESTDIR is used and the failing dependency check was
due to a typo in meson-0.61.4 (fixed in -r1, thanks sam).

Bug: https://bugs.gentoo.org/836294
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-kids/gmult/files/gmult-10.0-no-icon-cache.patch | 8 --------
 games-kids/gmult/gmult-10.0.ebuild                    | 4 ----
 2 files changed, 12 deletions(-)

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
deleted file mode 100644
index 2a355c17e228..000000000000
--- a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/836294
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,3 +56,3 @@
- gnome.post_install(
--    gtk_update_icon_cache: true,
-+    gtk_update_icon_cache: false,
- )

diff --git a/games-kids/gmult/gmult-10.0.ebuild b/games-kids/gmult/gmult-10.0.ebuild
index b0c8fcd25418..6df28b33de33 100644
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ b/games-kids/gmult/gmult-10.0.ebuild
@@ -26,10 +26,6 @@ BDEPEND="
 	$(vala_depend)
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0-no-icon-cache.patch
-)
-
 DOCS=( NEWS.md README.md )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit:     c5158a543e9aea9446ff139026cf0c632bdee8f2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 22:57:44 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 26 22:57:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5158a54

games-kids/gmult: drop 10.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-kids/gmult/Manifest                          |  1 -
 games-kids/gmult/files/gmult-10.0-meson-0.62.patch | 21 ------------
 games-kids/gmult/gmult-10.0.ebuild                 | 38 ----------------------
 3 files changed, 60 deletions(-)

diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
index 5411cef899ae..298e85c79718 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,2 +1 @@
-DIST gmult-10.0.tar.xz 186116 BLAKE2B 0c3936983e1c6e72de7aa4056abdb1ec53af282d3927ca34a622d531966adc62e2e9c6740ab6c0cb3cfc9aedc21344c8866c5a2388498bd97c0faa3d32fae80b SHA512 f3eb639d4d6a67ca7d11595f0c4d4c2da613a95714f647536485fef4b64d277bf6f5bf163e363da691806b53ea885c56844287fe943fd521f995c7cce18b6a36
 DIST gmult-12.0.tar.bz2 195103 BLAKE2B d1d93190a607dc62bf4809dff7c5240c97f49dc4c833ea91028e9810961125eadba6fac41852b53f674b14c1e4c777a8d9ed58496ad2641ad99ed961041c40c8 SHA512 617b51defaf61c7967c9ccd6898209330733709df4290717e6c158719d04c61a38fa6832197c937f8aef1da23dc2f820c707291761ef8437ab0e78850253768c

diff --git a/games-kids/gmult/files/gmult-10.0-meson-0.62.patch b/games-kids/gmult/files/gmult-10.0-meson-0.62.patch
deleted file mode 100644
index a3b12300e292..000000000000
--- a/games-kids/gmult/files/gmult-10.0-meson-0.62.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-New meson is more picky about using exe in test() that wasn't found.
-https://bugs.gentoo.org/843866
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -41,9 +41,11 @@
- )
- 
--test(
--    'validate-appstream',
--    appstream_util,
--    args: ['--nonet', 'validate-relax', gmult_appdata],
--)
-+if appstream_util.found()
-+    test(
-+        'validate-appstream',
-+        appstream_util,
-+        args: ['--nonet', 'validate-relax', gmult_appdata],
-+    )
-+endif
- 
- resources = gnome.compile_resources(

diff --git a/games-kids/gmult/gmult-10.0.ebuild b/games-kids/gmult/gmult-10.0.ebuild
deleted file mode 100644
index 7ef500d6f09a..000000000000
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson vala xdg
-
-DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
-HOMEPAGE="https://launchpad.net/gmult/"
-SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # only used for unnecessary .desktop/.po validation
-
-RDEPEND="
-	dev-libs/glib:2
-	gui-libs/gtk:4[introspection]
-	gui-libs/libadwaita:1[vala]
-	virtual/libintl
-	x11-libs/cairo
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	sys-devel/gettext"
-
-DOCS=( NEWS.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-0.62.patch
-)
-
-src_configure() {
-	vala_setup
-	meson_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit:     cd6360a570ec3b0067ddf252e5fe6c02e0986f86
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 11:41:42 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 11:47:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6360a5

games-kids/gmult: drop vala workaround patch

Seems fixed in vala-0.56.13 and is now instead causing a failure.

Could add some ranges in BDEPEND, but rather drop this mess
entirely.

Bug: https://bugs.gentoo.org/912438
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch | 15 ---------------
 games-kids/gmult/gmult-12.0.ebuild                   |  9 ---------
 2 files changed, 24 deletions(-)

diff --git a/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch b/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch
deleted file mode 100644
index fb0ba7a5227d..000000000000
--- a/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-vala-0.56.11 gtk4 bindings seemingly broke API, and so this
-workaround must either be applied conditionally or depend
-on >=vala-0.56.11 as it breaks older VALA_0_56 and we cannot
-check for minor versions from defines.
-
-https://bugs.gentoo.org/912438
---- a/gmult/main.vala
-+++ b/gmult/main.vala
-@@ -108,4 +108,4 @@
-     var provider = new Gtk.CssProvider();
--#if VALA_0_58
--    provider.load_from_data(css);
-+#if VALA_0_56
-+    provider.load_from_data(css, -1);
- #else

diff --git a/games-kids/gmult/gmult-12.0.ebuild b/games-kids/gmult/gmult-12.0.ebuild
index 6fda353fb576..d30313af7d24 100644
--- a/games-kids/gmult/gmult-12.0.ebuild
+++ b/games-kids/gmult/gmult-12.0.ebuild
@@ -30,15 +30,6 @@ BDEPEND="
 
 DOCS=( NEWS.md README.md )
 
-src_prepare() {
-	default
-
-	# TODO: verify if this is still needed with new vala releases
-	# as it may instead break them if reverted (see patch for details)
-	has_version -b ">=dev-lang/vala-0.56.11" &&
-		eapply "${FILESDIR}"/${PN}-12.0-vala-0.56.11.patch
-}
-
 src_configure() {
 	vala_setup
 	meson_src_configure