gentoo auto-resync : 11:11:2022 - 09:29:30

6 files changed, 117 insertions, 50 deletions

diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
index f738e46a2933..905718376eeb 100644
--- a/games-puzzle/gweled/Manifest
+++ b/games-puzzle/gweled/Manifest
@@ -1,4 +1,5 @@
-AUX gweled-0.9.1-gentoo.patch 360 BLAKE2B a1e618e443d08693fe9cce4d263f1ba7095606f0af5a8504fef8eccbb5d46d3fc42792468263c36e26b448cafc487b92258422c2eb3d46c5ac3c83e7bd9b3a15 SHA512 38efa262f9144d64363d0724291d786545875c0e81fe2e537be456b9fbade2d3a29210e70c4680f28009f317dce9c907745259bc4bc6ded22b0acffb19cb4db4
+AUX gweled-0.9.1-implicit-decl.patch 265 BLAKE2B 9793d3ee7358dd32464efec757357f6db7f272a49565c307785898b35d0474e23fee341616fc20eb0e186b783f7722c5036504bfdeca05bba28bc0d41196c6d1 SHA512 424d044b96e4125b07aed308c9dfe687952aa737a7705c13ec208d3a1f7d042275ebbbe6f039f29e84b934b7891fd615ef82a7f03336eeeacc009e79e1ba16e5
+AUX gweled-0.9.1-librsvg.patch 1161 BLAKE2B 883e7996937572a5ae48bd184395706cff928c61f5004ef2d418b066cb12e5d752364e0348095b83cff25ddd48c2459157ccd3fe63e3bf36b8480505c2aba4f0 SHA512 629ef535dfe8ea24a973b2fa0f6190bf8ffdb1113129eb6817bceda86c853d7815415ed40496041d0ce304b1d2561302c1d4662b13ddfc9a5c3c0723c728bf9e
 DIST gweled-0.9.1.tar.gz 403252 BLAKE2B 6a80e10fecc858a94d79deb7ad1a9dce0f5af36649bcb61c819816218fbcd72e70cdbfaa8915db13082a6274b75bd4c585c5f583f9f290bb95c2cb4468c4d2dd SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a
-EBUILD gweled-0.9.1-r2.ebuild 696 BLAKE2B ce6a0c0215106eba80d0188bfc4e419cd0358f4ef44aef4bae606ea42e518d70690ff162d04523955f16458850eeae574c4625ce5934d1e28eeb832418052781 SHA512 538a19c85daf8808cee07785c427c272ed334ec85df64f63d023f2b13e4a79e3df8a7d61e42a37851bbcfbdf081519b17f8713b5c294f5952c6360ed7017c804
+EBUILD gweled-0.9.1-r3.ebuild 913 BLAKE2B 5ed38592ddf0d7ae68fa261630d031d46d511f0b9b8405b1d55867797ee50ad83524f0ff8c1b6ce6f6c1df19aaaf2b629ce4918b81a1baea73f66bae80f42c19 SHA512 f290aec61fccee97269e5d5c5c2fa6e612e6dcf04a1f61d46b462c211bb1e5d1a7baa69a148ac36951e64effe626dc2d2219e9878f743c5981b1dc98b83a06ef
 MISC metadata.xml 328 BLAKE2B 9c2fccc813e00164ddee2c71c4bdddc44bc325f2e5545cffd092168a5ffbecd600410211f50b53f75c0a43303ba9ba7d3ec4be3c9b2454f8d858a3d7995ea72f SHA512 3b29466b5d91ebed14c24eb6e575f0830880b67c63cd3624991f249618f77f8db121be699726d1548e7720cb0c29cf1465b0abf8dad4c37350557c8f5ec5bfbb
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
deleted file mode 100644
index fa5857492da3..000000000000
--- a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in.old	2014-06-03 09:21:52.868225743 +0200
-+++ b/configure.in	2014-06-03 09:22:06.604614448 +0200
-@@ -66,7 +66,7 @@
-     *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;;
-    esac],[setgid=true;enable_setgid=yes])
- 
--scoredir='${localstatedir}/games'
-+scoredir='${localstatedir}/gweled'
- scores_group=games
- scores_user=games
- 
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch b/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch
new file mode 100644
index 000000000000..fc4f75f260ce
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/874738
+--- a/src/main.c
++++ b/src/main.c
+@@ -34,2 +34,3 @@
+ #include "games-scores-dialog.h"
++#include "games-setgid-io.h"
+ 
+--- a/src/main.h
++++ b/src/main.h
+@@ -26,2 +26,5 @@
+ void
++init_pref_window(void);
++
++void
+ save_preferences(void);
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch b/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch
new file mode 100644
index 000000000000..96d8a5571e34
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch
@@ -0,0 +1,45 @@
+Fix startup issues with >=librsvg-2.42.3
+https://bugs.gentoo.org/697514
+https://bugs.launchpad.net/gweled/+bug/1869038
+--- a/src/sge_utils.c
++++ b/src/sge_utils.c
+@@ -19,4 +19,5 @@
+  */
+ 
++#include <gio/gio.h>
+ #include <gtk/gtk.h>
+ #include <librsvg/rsvg.h>
+@@ -30,5 +31,6 @@
+ 	gchar *full_pathname;
+ 	GdkPixbuf *pixbuf = NULL;
+-	GError *error;
++	GError *error = NULL;
++	GFile *file;
+ 
+ 	full_pathname = g_strconcat(DATADIR "/pixmaps/",
+@@ -38,11 +40,23 @@
+ 		pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
+ 						   height, &error);
+-		g_free (full_pathname);
++		if (pixbuf == NULL) {
++			// Some versions of librsvg need URI instead of path.
++			// https://gitlab.gnome.org/GNOME/librsvg/issues/198
++			g_clear_error (&error);
++			file = g_file_new_for_path (full_pathname);
++			g_free (full_pathname);
++			full_pathname = g_file_get_uri (file);
++			g_object_unref (file);
++			pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
++							   height, &error);
++		}
+ 		if (pixbuf == NULL)
+-			g_free (error);
++			g_error_free (error);
+ 
+ 	} else
+ 		g_warning ("%s not found", filename);
+ 
++	g_free (full_pathname);
++
+ 	return pixbuf;
+ }
diff --git a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
deleted file mode 100644
index 0f88623656e1..000000000000
--- a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Bejeweled clone game"
-HOMEPAGE="http://www.gweled.org/"
-SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	media-libs/libmikmod
-	gnome-base/librsvg:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	append-ldflags -Wl,--export-dynamic
-
-	econf --disable-setgid
-}
diff --git a/games-puzzle/gweled/gweled-0.9.1-r3.ebuild b/games-puzzle/gweled/gweled-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..6c928fd0167e
--- /dev/null
+++ b/games-puzzle/gweled/gweled-0.9.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Bejeweled clone game"
+HOMEPAGE="https://launchpad.net/gweled/"
+SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/libmikmod
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-librsvg.patch
+	"${FILESDIR}"/${P}-implicit-decl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--with-scores-user=
+		--with-scores-group=gamestat
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fperms 2751 /usr/bin/${PN}
+	fperms 660 /var/games/*.scores
+}