From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E81615800A for ; Fri, 18 Aug 2023 12:12:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D476C2BC014; Fri, 18 Aug 2023 12:12:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC9B42BC014 for ; Fri, 18 Aug 2023 12:12:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD75133BF53 for ; Fri, 18 Aug 2023 12:12:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3328B8B for ; Fri, 18 Aug 2023 12:12:09 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1692360703.44ae26cf8619d521cf66e7bd2373740a024df7f6.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/files/, games-kids/gmult/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch games-kids/gmult/gmult-12.0.ebuild X-VCS-Directories: games-kids/gmult/ games-kids/gmult/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 44ae26cf8619d521cf66e7bd2373740a024df7f6 X-VCS-Branch: master Date: Fri, 18 Aug 2023 12:12:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fdc9c05f-be5b-4334-938b-2c52bdf79857 X-Archives-Hash: 32b4b0907c2690b9bb3eb2cac5d03dbc commit: 44ae26cf8619d521cf66e7bd2373740a024df7f6 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Aug 18 11:39:57 2023 +0000 Commit: Ionen Wolkens gentoo 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 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