[UPDATE] graphics/geeqie

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile 12 Oct 2022 09:37:00 -0000 1.36
+++ Makefile 29 Jun 2023 09:03:31 -0000
@@ -1,6 +1,6 @@
COMMENT= lightweight Gtk+3 based image viewer

-V= 2.0.1
+V= 2.1
DISTNAME= geeqie-${V}
EXTRACT_SUFX= .tar.xz
CATEGORIES= graphics
@@ -18,7 +18,8 @@ WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += gtk-3 heif intl jpeg lcms2 m openjp2 pango-1.0
WANTLIB += pangocairo-1.0 raw tiff

-COMPILER= base-clang ports-gcc base-gcc
+# C++14
+COMPILER= base-clang ports-gcc

MASTER_SITES= https://github.com/BestImageViewer/geeqie/releases/download/v${V}/

@@ -30,7 +31,8 @@ BUILD_DEPENDS= devel/gettext,-tools \
RUN_DEPENDS= devel/desktop-file-utils \
devel/xdg-utils \
graphics/ImageMagick \
- graphics/exiftran
+ graphics/exiftran \
+ x11/gtk+4,-guic

LIB_DEPENDS= graphics/exiv2 \
graphics/libraw \
@@ -40,15 +42,17 @@ LIB_DEPENDS= graphics/exiv2 \

CONFIGURE_ARGS+= -Darchive=disabled \
-Ddjvu=disabled \
+ -Dexecinfo=disabled \
-Dgps-map=disabled \
-Djpegxl=disabled \
-Dlua=disabled \
-Dpdf=disabled \
-Dspell=disabled \
-Dvideothumbnailer=disabled \
- -Dwebp=disabled \
-Dgq_htmldir=${PREFIX}/share/doc/geeqie \
-Dgq_helpdir=${PREFIX}/share/doc/geeqie
+
+LDFLAGS+= -lexiv2

post-extract:
sed -i 's,bash,sh,g' ${WRKSRC}/version.sh
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 8 Oct 2022 19:08:39 -0000 1.10
+++ distinfo 29 Jun 2023 09:03:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (geeqie-2.0.1.tar.xz) = icGnV0z+OIiXLRByP0zzonckm+pJT9nGMKqNDflEVV0=
-SIZE (geeqie-2.0.1.tar.xz) = 1666600
+SHA256 (geeqie-2.1.tar.xz) = 0FEbeEAWnTfkV4gNGrKnh8UrYJoKuPoaijkehB/dLd4=
+SIZE (geeqie-2.1.tar.xz) = 1800612
Index: patches/patch-config_h_in
===================================================================
RCS file: patches/patch-config_h_in
diff -N patches/patch-config_h_in
--- patches/patch-config_h_in 8 Oct 2022 19:08:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: config.h.in
---- config.h.in.orig
-+++ config.h.in
-@@ -160,9 +160,6 @@
- /* Define to 1 if you have the <string.h> header file. */
- #define HAVE_STRING_H 1
-
--/* Define to 1 if you have the `strverscmp' function. */
--#define HAVE_STRVERSCMP 1
--
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #define HAVE_SYS_STAT_H 1
-
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/graphics/geeqie/patches/patch-meson_build,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-meson_build
--- patches/patch-meson_build 8 Oct 2022 19:08:39 -0000 1.1
+++ patches/patch-meson_build 29 Jun 2023 09:03:31 -0000
@@ -1,21 +1,12 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -119,7 +119,7 @@ desktopdir = join_paths(datadir, meson.project_name(),
+@@ -138,7 +138,7 @@ desktopdir = join_paths(datadir, meson.project_name(),
helpdir = join_paths(prefix, gq_helpdir)
htmldir = join_paths(prefix, gq_htmldir)
icondir = join_paths(datadir, 'pixmaps')
-mandir1 = join_paths(datadir, 'man', 'man1')
+mandir1 = join_paths(prefix, 'man', 'man1')

- podir = join_paths(meson.source_root(), 'po')
-
-@@ -401,7 +401,7 @@ endif
- tiff_dep = []
- option = get_option('tiff')
- if not option.disabled()
-- tiff_dep = cc.find_library('libtiff', required: get_option('tiff'))
-+ tiff_dep = dependency('libtiff-4', required: get_option('tiff'))
- if tiff_dep.found()
- if cc.has_function('TIFFClientOpen', dependencies : tiff_dep)
- conf_data.set('HAVE_TIFF', 1)
+ podir = join_paths(meson.project_source_root(), 'po')
+ scriptsdir = join_paths(meson.project_source_root(), 'scripts')
Index: patches/patch-src_exif-common_cc
===================================================================
RCS file: patches/patch-src_exif-common_cc
diff -N patches/patch-src_exif-common_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_exif-common_cc 29 Jun 2023 09:03:31 -0000
@@ -0,0 +1,11 @@
+Index: src/exif-common.cc
+--- src/exif-common.cc.orig
++++ src/exif-common.cc
+@@ -17,6 +17,7 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
++#include <stdlib.h>
+ #include <config.h>
+
+ #define _XOPEN_SOURCE
Index: patches/patch-src_layout_util_c
===================================================================
RCS file: patches/patch-src_layout_util_c
diff -N patches/patch-src_layout_util_c
--- patches/patch-src_layout_util_c 8 Oct 2022 19:08:39 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: src/layout_util.c
---- src/layout_util.c.orig
-+++ src/layout_util.c
-@@ -19,6 +19,7 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#include <sys/wait.h>
- #include "main.h"
- #include "layout_util.h"
-
Index: patches/patch-src_window_c
===================================================================
RCS file: patches/patch-src_window_c
diff -N patches/patch-src_window_c
--- patches/patch-src_window_c 11 Mar 2022 19:22:21 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-Index: src/window.c
---- src/window.c.orig
-+++ src/window.c
-@@ -173,19 +173,11 @@ static gchar *html_browsers[] =
- {
- /* Our specific script */
- GQ_APPNAME_LC "_html_browser", NULL,
-- /* Redhat has a nifty htmlview script to start the user's preferred browser */
-- "htmlview", NULL,
-- /* Debian has even better approach with alternatives */
-- "sensible-browser", NULL,
-- /* GNOME 2 */
-- "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command",
-- /* KDE */
-- "kfmclient", "!kfmclient exec \"%s\"",
-+ /* fd.o */
-+ "xdg-open", NULL,
- /* use fallbacks */
- "firefox", NULL,
-- "mozilla", NULL,
- "konqueror", NULL,
-- "netscape", NULL,
- "opera", "!opera --remote 'openURL(%s,new-page)'",
- NULL, NULL
- };
Index: patches/patch-src_window_cc
===================================================================
RCS file: patches/patch-src_window_cc
diff -N patches/patch-src_window_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_window_cc 29 Jun 2023 09:03:31 -0000
@@ -0,0 +1,25 @@
+Index: src/window.cc
+--- src/window.cc.orig
++++ src/window.cc
+@@ -173,19 +173,11 @@ static const gchar *html_browsers[] =
+ {
+ /* Our specific script */
+ GQ_APPNAME_LC "_html_browser", nullptr,
+- /* Redhat has a nifty htmlview script to start the user's preferred browser */
+- "htmlview", nullptr,
+- /* Debian has even better approach with alternatives */
+- "sensible-browser", nullptr,
+- /* GNOME 2 */
+- "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command",
+- /* KDE */
+- "kfmclient", "!kfmclient exec \"%s\"",
++ /* fd.o */
++ "xdg-open", nullptr,
+ /* use fallbacks */
+ "firefox", nullptr,
+- "mozilla", nullptr,
+ "konqueror", nullptr,
+- "netscape", nullptr,
+ "opera", "!opera --remote 'openURL(%s,new-page)'",
+ nullptr, nullptr
+ };
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- pkg/PLIST 25 Jul 2022 07:33:01 -0000 1.13
+++ pkg/PLIST 29 Jun 2023 09:03:31 -0000
@@ -28,6 +28,7 @@ share/geeqie/applications/rotate.desktop
share/geeqie/applications/symlink.desktop
share/geeqie/applications/tethered-photography.desktop
share/geeqie/template.desktop
+share/icons/hicolor/scalable/apps/geeqie.svg
share/locale/ar/LC_MESSAGES/geeqie.mo
share/locale/be/LC_MESSAGES/geeqie.mo
share/locale/bg/LC_MESSAGES/geeqie.mo
@@ -73,3 +74,4 @@ share/metainfo/org.geeqie.Geeqie.appdata
share/pixmaps/
share/pixmaps/geeqie.png
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
Hi,
Attached diff updates geeqie to 2.1.
Changelog:
- Additional --selection remote commands
- Split view additional 3-image layout
- Many bug fixes
- Some progress in GTK4 migration
- Change source code from c to c++
- Much progress in making source code warning-free
- Updated language support

Tested on amd64.
OKs? Comments?