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

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

[Ionen Wolkens]

commit:     fe930d29997bc3950e120aaee37074a30734c4f9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 13:34:59 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May 12 13:38:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe930d29

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

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

 games-kids/gmult/files/gmult-10.0-meson-0.62.patch | 21 +++++++++++++++++++++
 games-kids/gmult/gmult-10.0.ebuild                 |  4 ++++
 2 files changed, 25 insertions(+)

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
new file mode 100644
index 000000000000..a3b12300e292
--- /dev/null
+++ b/games-kids/gmult/files/gmult-10.0-meson-0.62.patch
@@ -0,0 +1,21 @@
+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
index 6df28b33de33..7ef500d6f09a 100644
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ b/games-kids/gmult/gmult-10.0.ebuild
@@ -28,6 +28,10 @@ BDEPEND="
 
 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/files/, games-kids/gmult/

[Ionen Wolkens]

commit:     44ae26cf8619d521cf66e7bd2373740a024df7f6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 11:39:57 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 12:11:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44ae26cf

games-kids/gmult: workaround for vala-0.56.11

Will see how this go, but for now just do a dirty fix.

Closes: 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                   | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 2 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
new file mode 100644
index 000000000000..fb0ba7a5227d
--- /dev/null
+++ b/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch
@@ -0,0 +1,15 @@
+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 b2b12394e1db..6fda353fb576 100644
--- a/games-kids/gmult/gmult-12.0.ebuild
+++ b/games-kids/gmult/gmult-12.0.ebuild
@@ -20,14 +20,25 @@ RDEPEND="
 	>=gui-libs/libadwaita-1.3:1[vala]
 	virtual/libintl
 	x11-libs/cairo
-	x11-libs/pango"
+	x11-libs/pango
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(vala_depend)
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 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