gentoo auto-resync : 21:02:2023 - 02:22:31

4 files changed, 68 insertions, 12 deletions

diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
index 80f8f6929867..7aebceea6f58 100644
--- a/x11-libs/librfm/Manifest
+++ b/x11-libs/librfm/Manifest
@@ -1,3 +1,5 @@
+AUX librfm-5.3.16.3-C99-decls.patch 1029 BLAKE2B 7ad2decb4a30b61f787959b889c3189dad21878b6bf07e68e159745dd2d935e719fc9975d93a602866a0326426fe7209a25ebb1fe31a7de26f5022e6d23060f3 SHA512 9f76202437d22ac6137de2cdc2c2d5345fb992cb2d2f1b4296b8fce8040231248aa7161241dd7870a17dc95b5baa3f3030bc9368b6659dd6b52a15483307a418
+AUX librfm-5.3.16.3-autotools.patch 183 BLAKE2B 9e462495e62bbb65b445cd3f96a225cfa415f890cd972c7d05e4fe18cf321f1832251e642e0cd5b161aab5c323f8fcc66d3f4da6c0d630e4a6c05432ed7bec3b SHA512 36eb2355aa54d5ba627309572937cc1e1ef57918f966d3565d33a441fc70a510b85fec0e7c5c80cefb3e27e9288bdfd0c54b666d15ab241f956c4e5386334c5f
 DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000
-EBUILD librfm-5.3.16.3-r1.ebuild 909 BLAKE2B 2388116837748847d05dc379cbc1b3553f3a041a0e96125d1e3cfaed97949ac5ae8ab3b6b89d8f78f3f75d80546b9042666616aae347f596ae928d62bd0e5c17 SHA512 a19b226fa80dc06b7316310f2c9cac512f36d5759910f8b5c34aef0da042b026c4ea3d97a3d394203f9c29447296acd895f18545ed4dc62ffeea27ef4317ac07
+EBUILD librfm-5.3.16.3-r2.ebuild 933 BLAKE2B 7e02ef4dc764062efb1000df3081b3a75fb036e6aa1a952a16dbfa19d95521a8c08170e0c3fd220ee9634ddf69bcd58bafd62c7e00078e9e43a3c36596c8045b SHA512 22fb7beaf7d8ca25def46ae5f4018ac43b261b778628d289a1a0bbc7c606c72904584aad8a62424bb86a144c0e17cac9b97a0a4388242b21d7f84bbccf5fa931
 MISC metadata.xml 240 BLAKE2B a5193cf983552811b78bd72f125986ab478c1204169c2798994021bda72e76bb1103643d6f030e18c6ccc73adad6acf0c3eec4a24843a0c64588df9dd0775d69 SHA512 2ef3bc56ce598ee3f34fdf992e7f642ab80b88eb20fe7a92b02a57203bbbf2964cde9b8e1f28a8bdf744f66932640939cf388c1474e69a64ed817bc8e537e8fe
diff --git a/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch b/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch
new file mode 100644
index 000000000000..784647ca92f1
--- /dev/null
+++ b/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch
@@ -0,0 +1,42 @@
+--- a/modules/settings-module.i
++++ b/modules/settings-module.i
+@@ -36,7 +36,7 @@
+ #define SHRED_OPTIONS rfm_void(RFM_MODULE_DIR, "callbacks","get_shred_options")
+ */
+ 
+-static GtkWidget *rfm_check_button_new(){
++static GtkWidget *rfm_check_button_new(void){
+ 	return gtk_check_button_new ();
+ }
+ static void
+@@ -374,7 +374,7 @@
+ }
+ 
+ 
+-static gchar **get_program_options(i){
++static gchar **get_program_options(gint i){
+     if (i >= RFM_OPTIONS) return NULL;
+     environ_t *environ_v = rfm_get_environ();
+     return environ_v[i].env_options;
+--- a/primary/primary-icons.i
++++ b/primary/primary-icons.i
+@@ -181,7 +181,7 @@
+ 	
+ 
+ static void
+-init_lite_hash () {
++init_lite_hash (void) {
+     // g_once init
+     static gsize initialized = 0;
+     if (g_once_init_enter (&initialized)){
+--- a/primary/primary.c
++++ b/primary/primary.c
+@@ -1405,7 +1405,7 @@
+ }
+ 
+ static 
+-gint get_paste_length(){
++gint get_paste_length(void){
+     gint fd = shm_open (PASTE_SHM_NAME, O_RDONLY, S_IRUSR | S_IWUSR);
+     if(fd < 0){
+ 	return 0;
diff --git a/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch b/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch
new file mode 100644
index 000000000000..4913468741d1
--- /dev/null
+++ b/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch
@@ -0,0 +1,10 @@
+--- a/m4/rfm-conditionals.m4
++++ b/m4/rfm-conditionals.m4
+@@ -174,7 +174,6 @@
+ else
+ 	AC_SUBST(WITH_DEBUG) WITH_DEBUG=no
+ 	AC_MSG_NOTICE([No debug for you.])
+-	CFLAGS="-O2"
+ fi
+ ])
+ 
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
index cdb51d846231..55991898b946 100644
--- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 MY_P="${PN}5-${PV}"
@@ -9,11 +10,11 @@ MY_P="${PN}5-${PV}"
 DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager"
 HOMEPAGE="http://xffm.org/libxffm.html"
 SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.22.5:2
@@ -24,18 +25,19 @@ RDEPEND="
 	>=gnome-base/librsvg-2.26:2
 	>=x11-libs/cairo-1.12.6[X]
 	>=x11-libs/gtk+-3.12:3[X]
-	>=x11-libs/pango-1.28.0[X]
-	!<x11-misc/rodent-5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+	>=x11-libs/pango-1.28.0[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-C99-decls.patch
+)
 
 src_prepare() {
 	default
-	sed -i -e "s|-O2|${CFLAGS}|" m4/rfm-conditionals.m4 || die
 	eautoreconf
 }