git: d00fb2a9b6d7 - main - x11/rofi-file-browser-extended: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 13 Mar 2024 16:21:45 UTC
The branch main has been updated by nivit:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d00fb2a9b6d70929ca38a14b8d095daa7bef2865
commit d00fb2a9b6d70929ca38a14b8d095daa7bef2865
Author: Nicola Vitale <nivit@FreeBSD.org>
AuthorDate: 2024-03-13 16:15:29 +0000
Commit: Nicola Vitale <nivit@FreeBSD.org>
CommitDate: 2024-03-13 16:15:29 +0000
x11/rofi-file-browser-extended: Fix build
The build fails with the following error:
FAILED: CMakeFiles/filebrowser.dir/src/filebrowser.c.o
/usr/bin/cc -D_XOPEN_SOURCE=700 -Dfilebrowser_EXPORTS -I/wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/include -I/usr/local/include/cairo -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/pixman-1 -I/usr/local/include/libpng16 -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DNDEBUG -fPIC -MD -MT CMakeFiles/filebrowser.dir/src/filebrowser.c.o -MF CMakeFiles/filebrowser.dir/src/filebrowser.c.o.d -o CMakeFiles/filebrowser.dir/src/filebrowser.c.o -c /wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/src/filebrowser.c
/wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/src/filebrowser.c:380:27: error: 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,
^~~~~~~~~~~~~~~~~~~~~
1 error generated.
So apply the patch provided at
https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
and used by the Gentoo port too:
https://bugs.gentoo.org/880985
Reported by: pkg-fallout
---
x11/rofi-file-browser-extended/Makefile | 4 ++++
x11/rofi-file-browser-extended/distinfo | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/x11/rofi-file-browser-extended/Makefile b/x11/rofi-file-browser-extended/Makefile
index e2228c14c2af..e96030acc608 100644
--- a/x11/rofi-file-browser-extended/Makefile
+++ b/x11/rofi-file-browser-extended/Makefile
@@ -3,6 +3,10 @@ DISTVERSION= 1.3.1
PORTREVISION= 1
CATEGORIES= x11
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES= 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch:-p1 # Fix function pointer initialization
+PATCHFILES+= 4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch:-p1 # Check that 'height' is within INT_MAX
+
MAINTAINER= nivit@FreeBSD.org
COMMENT= Use rofi to quickly open files
WWW= https://github.com/marvinkreis/rofi-file-browser-extended
diff --git a/x11/rofi-file-browser-extended/distinfo b/x11/rofi-file-browser-extended/distinfo
index 054b9d945aba..033885f2e77c 100644
--- a/x11/rofi-file-browser-extended/distinfo
+++ b/x11/rofi-file-browser-extended/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1669926301
+TIMESTAMP = 1710338595
SHA256 (marvinkreis-rofi-file-browser-extended-1.3.1_GH0.tar.gz) = 9e010e671533dd747e6e7ae4ed290b6e2829e758ca073381fa8a8fe53e004660
SIZE (marvinkreis-rofi-file-browser-extended-1.3.1_GH0.tar.gz) = 27169
+SHA256 (6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch) = b7bc88eb8c810cbcc8c5a818870b7e9f435ca608f29c16306204cbb4ee3b75b5
+SIZE (6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch) = 1426
+SHA256 (4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch) = 6ad8680393b22ee363a7e1e0dacc72f02917133ea24a7ddcb34e9ee3700cb662
+SIZE (4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch) = 1226