gentoo auto-resync : 11:11:2022 - 15:30:13

4 files changed, 30 insertions, 2 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index fc061bae2d1e..ee87beb58589 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/rofi-file-browser-extended/Manifest b/x11-misc/rofi-file-browser-extended/Manifest
index b1591e1201e2..4631ba6d79d4 100644
--- a/x11-misc/rofi-file-browser-extended/Manifest
+++ b/x11-misc/rofi-file-browser-extended/Manifest
@@ -1,6 +1,7 @@
 AUX rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch 894 BLAKE2B cba371ca1849909d6bf1b5f0fac981bda25daf8f059a90b56e9add8d733e963bcaa7e4e6dd007bcd5ed9dcd71d08e06bcf2bfe5d23a3c0d24d9e54c0749f916d SHA512 98eaec5cb83206e9fe1a28cf37dd00999247d18708bb8f43febed839a354bf1ae95bd4bff9c54a617ea90045d7e2fb4197e994a0b6ef41cf11c0eaad5e550d95
+AUX rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch 1267 BLAKE2B 4d1c4613a2e90f03f0d50aae7f4b3dea211b247fa5021bb818e7b4745f2c75a7df590bc4e591b141bf696a0c14441787ba71a489715910df239f9c8ead4caec7 SHA512 3a8e92d9f519bf5cf077729b53ffef0b1b5aa2c3770c520cd7da653dd89627d2b27f4c64b8257604320c48ef446afaeba4c7e811b9c4ac16478f74e09fdc7960
 DIST rofi-file-browser-extended-1.2.0.tar.gz 23560 BLAKE2B bb5637e9a56009949b4241c218a73fdb79cf5065906b7f48874ee64e3d38d4b68a751eec937eededd040086b2560f6e6f92440d9cc0900be3f3dee54a03f8f83 SHA512 74e5adeadaa0322e1d489bda79db58b416553daefbbc353012b82855529875aefd42c53458efe059ee1aa7ea6b7550b791dd56a11c207c5cc6f4ed46d17bdb81
 DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2 SHA512 269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1
 EBUILD rofi-file-browser-extended-1.2.0-r2.ebuild 771 BLAKE2B b87c5f1d936624b0755efdc0bb0ea6bd1d411466b7b094fc8864135a027eb2866dfa82d94e68684451de9b9d43b451240833f9276942f987c2c78bdc710ccfa3 SHA512 ae263caa1a9ba396074a26654e453a9cd1e6aaa57e189e0c4c8eb96895eb71ae3e62100fadcbfa23bd4805da6ccae589c1186d7977cec06260415a0d19d8d9fc
-EBUILD rofi-file-browser-extended-1.3.1.ebuild 851 BLAKE2B 120a25ea09ed3fd539f881e51136dd8ac081a9d6023ed4e5b3a5e3371bb66ac4295048c37701e67fdca0ed8c5b5c9db3d1d9a3b74189316e6b54689308dc01f8 SHA512 f2ab3d6a81f0d2e07af6cad97c1e4c7caf29550930ca5001724b007cc7a854610c8ac7adfb4686cc147b6201a24c3b2b0d4b61102aacb9b3b01aea8cdc8b7f16
+EBUILD rofi-file-browser-extended-1.3.1-r1.ebuild 1024 BLAKE2B 99b1aa10a5f9949a373d10d0e293e0d557f09d19255d8f7f73b44c293cf508d5257597f7b164e41c85782743f6b7db2fc194366ff6dca1fe4d5d6be03adc95d5 SHA512 7edfa3534bedabe669e4823e7a7f6799e8457b1504118aa5e55fd018f8f91217835065d7e1be4d8935824b581402665e591466198bd24f246600f7af0a901559
 MISC metadata.xml 247 BLAKE2B 4e1dbdae308a736b571e2a7ab4a90c650461771c024127c95a33990f3973331ba5de3cc8fe960115af9bb06f49908d258211b2a4e07c0f8d2a9536c965d836c3 SHA512 734659aca9188fe48564f64e23622ef0201931c75e1306043902fcf487a4155e8027a378872a48c7e34a903cdd0363a8e237b0965b7f532f80eaf38353940dbc
diff --git a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
new file mode 100644
index 000000000000..0cfff4286608
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
@@ -0,0 +1,23 @@
+From 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 11 Nov 2022 15:03:32 +0100
+Subject: [PATCH] Fix function pointer initialization
+
+Fix
+
+src/filebrowser.c:380:27: warning: incompatible function pointer types initializing '_mode_get_icon' (aka 'struct _cairo_surface *(*)(const struct rofi_mode *, unsigned int, unsigned int)') with an expression of type 'cairo_surface_t *(const Mode *, unsigned int, int)' (aka 'struct _cairo_surface *(const struct rofi_mode *, unsigned int, int)') [-Wincompatible-function-pointer-types]
+    ._get_icon          = file_browser_get_icon,
+                          ^~~~~~~~~~~~~~~~~~~~~
+
+See also https://bugs.gentoo.org/880985
+--- a/src/filebrowser.c
++++ b/src/filebrowser.c
+@@ -263,7 +263,7 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec
+     }
+ }
+ 
+-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height )
++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height )
+ {
+     FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw );
+     FileBrowserFileData *fd = &pd->file_data;
diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
index 2be17da588a0..a3fe3b3b176b 100644
--- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild
+++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
@@ -30,10 +30,14 @@ DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES=(
+	# https://bugs.gentoo.org/880985 https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
+	"${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch"
+)
+
 src_prepare() {
 	# Delete the lines in CMakeLists.txt that install the man page.
 	sed -i "45,56d" CMakeLists.txt || die
-	default
 	cmake_src_prepare
 }