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
