CVS commit: pkgsrc/graphics/geeqie
"Thomas Klausner" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: wiz
Date: Sun Aug 9 17:28:29 UTC 2026
Modified Files:
pkgsrc/graphics/geeqie: Makefile distinfo options.mk
Added Files:
pkgsrc/graphics/geeqie/patches: patch-src_cellrenderericon.cc
Log Message:
geeqie: update to 3.1.
Migrate to GTK4.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/geeqie/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/geeqie/patches/patch-src_cellrenderericon.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 4.7 KB)
Modified files:
Index: pkgsrc/graphics/geeqie/Makefile
diff -u pkgsrc/graphics/geeqie/Makefile:1.169 pkgsrc/graphics/geeqie/Makefile:1.170
--- pkgsrc/graphics/geeqie/Makefile:1.169 Tue Jul 28 05:40:24 2026
+++ pkgsrc/graphics/geeqie/Makefile Sun Aug 9 17:28:28 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.169 2026/07/28 05:40:24 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2026/08/09 17:28:28 wiz Exp $
-DISTNAME= geeqie-2.9
+DISTNAME= geeqie-3.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=BestImageViewer/}
EXTRACT_SUFX= .tar.xz
@@ -36,6 +36,10 @@ MESON_ARGS+= --localedir='${PKGLOCALEDIR
INSTALLATION_DIRS= ${PKGMANDIR}/man1
+# test status as of 3.1
+# Ok: 1058
+# Fail: 1
+
.include "../../mk/bsd.fast.prefs.mk"
post-install:
@@ -54,5 +58,5 @@ post-install:
.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../devel/gettext-tools/msgfmt-desktop.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtk4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.46 pkgsrc/graphics/geeqie/distinfo:1.47
--- pkgsrc/graphics/geeqie/distinfo:1.46 Sun Jun 28 14:04:05 2026
+++ pkgsrc/graphics/geeqie/distinfo Sun Aug 9 17:28:28 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.46 2026/06/28 14:04:05 wiz Exp $
+$NetBSD: distinfo,v 1.47 2026/08/09 17:28:28 wiz Exp $
-BLAKE2s (geeqie-2.9.tar.xz) = a27f2760635d6dfbebb0feed78914ddf90bdd8b119511367f51860e15f9901fb
-SHA512 (geeqie-2.9.tar.xz) = 642d705556ef96bddf86349de097aee8375b57804d1341329e05d5e205301407ed7e57acfefa0e5ad04e45c4a14c281496c574f4f9302705204cc1bc8e50d670
-Size (geeqie-2.9.tar.xz) = 1920800 bytes
+BLAKE2s (geeqie-3.1.tar.xz) = 2b93333da8ee671bb693579a34ae71333c46d4224355b0c7e2ce8ba3e94f3909
+SHA512 (geeqie-3.1.tar.xz) = b0d70bf49446eebc5b4a741099cf81cc7010c72633d38eac5154f5683c653724ee8934a3b20413b1b963b109c3592fdbf437f5c660491421a0ce97f9f19f64a8
+Size (geeqie-3.1.tar.xz) = 1937624 bytes
+SHA1 (patch-src_cellrenderericon.cc) = f462d37f6fae1b54fce3dc9a0ecb95b35c591573
Index: pkgsrc/graphics/geeqie/options.mk
diff -u pkgsrc/graphics/geeqie/options.mk:1.12 pkgsrc/graphics/geeqie/options.mk:1.13
--- pkgsrc/graphics/geeqie/options.mk:1.12 Tue Jul 21 15:47:06 2026
+++ pkgsrc/graphics/geeqie/options.mk Sun Aug 9 17:28:28 2026
@@ -1,37 +1,25 @@
-# $NetBSD: options.mk,v 1.12 2026/07/21 15:47:06 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2026/08/09 17:28:28 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie
-PKG_SUPPORTED_OPTIONS= gspell libarchive libchamplain libraw libwebp pdf # gtk4
+PKG_SUPPORTED_OPTIONS= libarchive libraw libshumate libwebp pdf
PKG_SUGGESTED_OPTIONS= # none
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mgspell)
-.include "../../textproc/gspell/buildlink3.mk"
-.endif
-
-#.if !empty(PKG_OPTIONS:Mgtk4)
-## doesn't build as of 2.9
-#MESON_ARGS+= -Dgtk4=enabled
-#.include "../../x11/gtk4/buildlink3.mk"
-#.else
-#.include "../../x11/gtk3/buildlink3.mk"
-#.endif
+# TODO libspelling option, when package exists
.if !empty(PKG_OPTIONS:Mlibarchive)
.include "../../archivers/libarchive/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mlibchamplain)
-# While clutter is optional, the map requires it.
-.include "../../graphics/clutter/buildlink3.mk"
-.include "../../geography/libchamplain012/buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mlibraw)
.include "../../graphics/libraw/buildlink3.mk"
.endif
+.if !empty(PKG_OPTIONS:Mlibshumate)
+.include "../../geography/libshumate/buildlink3.mk"
+.endif
+
.if !empty(PKG_OPTIONS:Mlibwebp)
.include "../../graphics/libwebp/buildlink3.mk"
.endif
Added files:
Index: pkgsrc/graphics/geeqie/patches/patch-src_cellrenderericon.cc
diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-src_cellrenderericon.cc:1.1
--- /dev/null Sun Aug 9 17:28:29 2026
+++ pkgsrc/graphics/geeqie/patches/patch-src_cellrenderericon.cc Sun Aug 9 17:28:28 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_cellrenderericon.cc,v 1.1 2026/08/09 17:28:28 wiz Exp $
+
+../src/cellrenderericon.cc: In function 'gint gqv_cell_renderer_icon_mark_at(GtkCellRenderer*, GtkWidget*, const GdkRectangle*, gdouble, gdouble)':
+../src/cellrenderericon.cc:101:50: error: 'floor' is not a member of 'std'; did you mean 'floor'?
+ 101 | return std::clamp(static_cast<gint>(std::floor(((x - first_center) / TOGGLE_SPACING) + 0.5)),
+ | ^~~~~
+
+--- src/cellrenderericon.cc.orig 2026-08-09 17:20:27.910468088 +0000
++++ src/cellrenderericon.cc
+@@ -20,6 +20,7 @@
+ #include "cellrenderericon.h"
+
+ #include <algorithm>
++#include <cmath>
+ #include <cstddef>
+
+ #include <cairo.h>