CVS commit: pkgsrc/graphics/geeqie

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 26 14:13:02 UTC 2024

Modified Files:
        pkgsrc/graphics/geeqie: Makefile PLIST distinfo options.mk
        pkgsrc/graphics/geeqie/patches: patch-src_exif-common.cc
Removed Files:
        pkgsrc/graphics/geeqie/patches: patch-meson.build patch-src_meson.build
            patch-src_misc.cc

Log Message:
geeqie: update to 2.2.

Add more options (libarchive, libraw, pdf, gspell, libwebp), default off for now.

- Enhanced debug output with -Ddevel=enabled option
- GitHub workflows for code tests and AppImage building
- Modify Collections user interface
- Remote keyboard actions
- Allow .desktop files to be linked to programmable mouse buttons
- Option to show-hide selectable bars
- On exit additional check for multiple windows open
- Plugin to resize an image
- Include a separator as a toolbar option
- Change all .desktop files to RDNS style
- GTK "Open With" feature menu option
- Reduce the height of toolbars
- Option to select "hamburger" menu style
- More progress in GTK4 migration
- Many bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/geeqie/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/geeqie/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/geeqie/patches/patch-meson.build
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/geeqie/patches/patch-src_meson.build
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/geeqie/patches/patch-src_misc.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/geeqie/Makefile
diff -u pkgsrc/graphics/geeqie/Makefile:1.121 pkgsrc/graphics/geeqie/Makefile:1.122
--- pkgsrc/graphics/geeqie/Makefile:1.121       Mon Jan  1 11:41:12 2024
+++ pkgsrc/graphics/geeqie/Makefile     Fri Jan 26 14:13:01 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2024/01/01 11:41:12 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2024/01/26 14:13:01 wiz Exp $
 
-DISTNAME=      geeqie-2.1
-PKGREVISION=   6
+DISTNAME=      geeqie-2.2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=BestImageViewer/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/geeqie/PLIST
diff -u pkgsrc/graphics/geeqie/PLIST:1.13 pkgsrc/graphics/geeqie/PLIST:1.14
--- pkgsrc/graphics/geeqie/PLIST:1.13   Sat Jun 17 16:45:43 2023
+++ pkgsrc/graphics/geeqie/PLIST        Fri Jan 26 14:13:01 2024
@@ -1,29 +1,35 @@
-@comment $NetBSD: PLIST,v 1.13 2023/06/17 16:45:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/01/26 14:13:01 wiz Exp $
 bin/geeqie
+lib/geeqie/downsize
 lib/geeqie/geeqie-camera-import
 lib/geeqie/geeqie-camera-import-hook-script
 lib/geeqie/geeqie-export-jpeg
 lib/geeqie/geeqie-image-crop
 lib/geeqie/geeqie-random-image
+lib/geeqie/geeqie-resize-image
 lib/geeqie/geeqie-rotate
 lib/geeqie/geeqie-symlink
 lib/geeqie/geeqie-tethered-photography
 lib/geeqie/geeqie-tethered-photography-hook-script
 lib/geeqie/geocode-parameters.awk
 lib/geeqie/lensID
+lib/geeqie/resize-help.sh
 man/man1/geeqie.1
-share/applications/geeqie.desktop
+share/applications/org.geeqie.Geeqie.desktop
 share/doc/geeqie/COPYING
 share/doc/geeqie/README.md
 share/doc/geeqie/TODO
-share/geeqie/applications/camera-import.desktop
-share/geeqie/applications/export-jpeg.desktop
-share/geeqie/applications/image-crop.desktop
-share/geeqie/applications/random-image.desktop
-share/geeqie/applications/rotate.desktop
-share/geeqie/applications/symlink.desktop
-share/geeqie/applications/tethered-photography.desktop
-share/geeqie/template.desktop
+share/geeqie/applications/org.geeqie.camera-import.desktop
+share/geeqie/applications/org.geeqie.export-jpeg.desktop
+share/geeqie/applications/org.geeqie.image-crop.desktop
+share/geeqie/applications/org.geeqie.open-with.desktop
+share/geeqie/applications/org.geeqie.random-image.desktop
+share/geeqie/applications/org.geeqie.resize-image.desktop
+share/geeqie/applications/org.geeqie.rotate.desktop
+share/geeqie/applications/org.geeqie.symlink.desktop
+share/geeqie/applications/org.geeqie.tethered-photography.desktop
+share/geeqie/applications/org.geeqie.video-player.desktop
+share/geeqie/org.geeqie.template.desktop
 share/icons/hicolor/scalable/apps/geeqie.svg
 share/locale/ar/LC_MESSAGES/geeqie.mo
 share/locale/be/LC_MESSAGES/geeqie.mo

Index: pkgsrc/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.33 pkgsrc/graphics/geeqie/distinfo:1.34
--- pkgsrc/graphics/geeqie/distinfo:1.33        Sun Jun 18 12:13:28 2023
+++ pkgsrc/graphics/geeqie/distinfo     Fri Jan 26 14:13:01 2024
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.33 2023/06/18 12:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.34 2024/01/26 14:13:01 wiz Exp $
 
-BLAKE2s (geeqie-2.1.tar.xz) = 179c98a22e51fcc7cbe7f9832f1a0902abbf3c8ef688a809bd24ba2cef82cbc1
-SHA512 (geeqie-2.1.tar.xz) = 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
-Size (geeqie-2.1.tar.xz) = 1800612 bytes
-SHA1 (patch-meson.build) = 311a42d3250251a8b274a5124bacf31fe0dc541a
-SHA1 (patch-src_exif-common.cc) = 3d3bb4963a71d3d138287aa418c86455f73734e0
-SHA1 (patch-src_meson.build) = 472290eb04acc6761fe50e415270f68a2c628b55
-SHA1 (patch-src_misc.cc) = 8b5ed531aa5bd15dfd296329c623d3fe9d7229eb
+BLAKE2s (geeqie-2.2.tar.xz) = e03408fa45c5384a7a92b13c1d6d318e6013ce896309a71f2d59d754acef5d38
+SHA512 (geeqie-2.2.tar.xz) = 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
+Size (geeqie-2.2.tar.xz) = 2169096 bytes
+SHA1 (patch-src_exif-common.cc) = 122c1ea386578a00f9eba36dce1f5aabe5f6343b

Index: pkgsrc/graphics/geeqie/options.mk
diff -u pkgsrc/graphics/geeqie/options.mk:1.10 pkgsrc/graphics/geeqie/options.mk:1.11
--- pkgsrc/graphics/geeqie/options.mk:1.10      Mon Nov 21 22:28:41 2022
+++ pkgsrc/graphics/geeqie/options.mk   Fri Jan 26 14:13:01 2024
@@ -1,13 +1,33 @@
-# $NetBSD: options.mk,v 1.10 2022/11/21 22:28:41 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2024/01/26 14:13:01 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.geeqie
-PKG_SUPPORTED_OPTIONS=         libchamplain
+PKG_SUPPORTED_OPTIONS=         gspell libarchive libchamplain libraw 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: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:Mlibwebp)
+.include "../../graphics/libwebp/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpdf)
+.include "../../print/poppler/buildlink3.mk"
+.endif

Index: pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc
diff -u pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc:1.2 pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc:1.3
--- pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc:1.2 Sat Jun 17 16:50:53 2023
+++ pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc     Fri Jan 26 14:13:01 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_exif-common.cc,v 1.2 2023/06/17 16:50:53 wiz Exp $
+$NetBSD: patch-src_exif-common.cc,v 1.3 2024/01/26 14:13:01 wiz Exp $
 
-../src/exif-common.cc:780:3: error: 'setenv' was not declared in this scope; did you mean 'getenv'?                                                                                                    
            
-https://github.com/BestImageViewer/geeqie/pull/1110
+With _XOPEN_SOURCE defined without value, NetBSD headers don't provide setenv().
+https://github.com/BestImageViewer/geeqie/issues/1230
 
---- src/exif-common.cc.orig    2023-06-17 12:12:30.000000000 +0000
+--- src/exif-common.cc.orig    2024-01-26 13:57:52.740080922 +0000
 +++ src/exif-common.cc
-@@ -19,6 +19,8 @@
+@@ -19,7 +19,7 @@
  
  #include <config.h>
  
-+#include <stdlib.h>
-+
- #define _XOPEN_SOURCE
+-#define _XOPEN_SOURCE
++//#define _XOPEN_SOURCE
  
- #include <string.h>
+ #include <cmath>
+ #include <cstdlib>