CVS commit: pkgsrc/graphics/geeqie

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 20 12:03:09 UTC 2022

Modified Files:
        pkgsrc/graphics/geeqie: Makefile PLIST distinfo
        pkgsrc/graphics/geeqie/patches: patch-ac

Log Message:
geeqie: update to 1.7.3.

pkgsrc: enable some more modern image formats (heif, webp, jp2)

Geeqie 1.7.3
============

- Fix crash with Flatpak version

Geeqie 1.7.2
============

- Copy image to clipboard option
- Fix MacOS problems
- Multi-threaded find duplicates
- Generate sRGB thumbnails for images with embedded color profile
- External image decoder option
- AppImage supported
- Support jpeg xl format
- Automated cache maintenance
- Support archive (e.g. zip) files
- Use system theme background color

And as usual:
- Many small improvements
- Many bug fixes
- Updated language support


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/geeqie/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/geeqie/patches/patch-ac

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.94 pkgsrc/graphics/geeqie/Makefile:1.95
--- pkgsrc/graphics/geeqie/Makefile:1.94        Mon Apr 18 19:11:16 2022
+++ pkgsrc/graphics/geeqie/Makefile     Fri May 20 12:03:08 2022
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.94 2022/04/18 19:11:16 adam Exp $
+# $NetBSD: Makefile,v 1.95 2022/05/20 12:03:08 wiz Exp $
 
-DISTNAME=      geeqie-1.6
-PKGREVISION=   4
+DISTNAME=      geeqie-1.7.3
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.geeqie.org/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=BestImageViewer/}
 EXTRACT_SUFX=  .tar.xz
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      http://www.geeqie.org/
 COMMENT=       Image viewer
 LICENSE=       gnu-gpl-v2
 
+BUILD_DEPENDS+=        gettext-m4-[0-9]*:../../devel/gettext-m4
+
 GNU_CONFIGURE=         yes
 
 LDFLAGS.SunOS+=                -lm -lsocket -lnsl
@@ -20,15 +22,20 @@ USE_LANGUAGES=              c c++
 USE_TOOLS=             bash:run gmake intltool msgfmt pkg-config automake autoconf autoreconf
 
 REPLACE_BASH+=         plugins/*/*
-REPLACE_BASH+=         gen_changelog.sh
+REPLACE_BASH+=         doc/*.sh
+REPLACE_BASH+=         g*.sh
+REPLACE_BASH+=         version.sh
 
-pre-configure:
-       cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+pre-configure: replace-interpreter
+       cd ${WRKSRC} && autoreconf -fiv
 
 .include "options.mk"
 
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libheif/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.gnome-doc-utils+=        gnome-doc-utils>=0.20.10nb4
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"

Index: pkgsrc/graphics/geeqie/PLIST
diff -u pkgsrc/graphics/geeqie/PLIST:1.10 pkgsrc/graphics/geeqie/PLIST:1.11
--- pkgsrc/graphics/geeqie/PLIST:1.10   Sun Dec  6 10:22:21 2020
+++ pkgsrc/graphics/geeqie/PLIST        Fri May 20 12:03:08 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/12/06 10:22:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/05/20 12:03:08 wiz Exp $
 bin/geeqie
 lib/geeqie/geeqie-camera-import
 lib/geeqie/geeqie-camera-import-hook-script
@@ -9,7 +9,6 @@ lib/geeqie/geeqie-rotate
 lib/geeqie/geeqie-symlink
 lib/geeqie/geeqie-tethered-photography
 lib/geeqie/geeqie-tethered-photography-hook-script
-lib/geeqie/geeqie-ufraw
 lib/geeqie/geocode-parameters.awk
 lib/geeqie/lensID
 man/man1/geeqie.1
@@ -23,9 +22,6 @@ share/doc/${PKGNAME}/README.md
 share/doc/${PKGNAME}/TODO
 share/geeqie/applications/camera-import.desktop
 share/geeqie/applications/export-jpeg.desktop
-share/geeqie/applications/geeqie-ufraw-id.desktop
-share/geeqie/applications/geeqie-ufraw-recursive.desktop
-share/geeqie/applications/geeqie-ufraw.desktop
 share/geeqie/applications/image-crop.desktop
 share/geeqie/applications/random-image.desktop
 share/geeqie/applications/rotate.desktop

Index: pkgsrc/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.23 pkgsrc/graphics/geeqie/distinfo:1.24
--- pkgsrc/graphics/geeqie/distinfo:1.23        Tue Oct 26 10:46:09 2021
+++ pkgsrc/graphics/geeqie/distinfo     Fri May 20 12:03:08 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 10:46:09 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/05/20 12:03:08 wiz Exp $
 
-BLAKE2s (geeqie-1.6.tar.xz) = 53af7488af4d3f9922c60bbc41c4399a2ee28aae10701b2d5ef995aa6a3ec220
-SHA512 (geeqie-1.6.tar.xz) = 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
-Size (geeqie-1.6.tar.xz) = 1693488 bytes
-SHA1 (patch-ac) = b85998dc728b92689bc34f4b2cfcbb44ce56a8e6
+BLAKE2s (geeqie-1.7.3.tar.xz) = 81f86e9d23ef3677c70731aed68617e227cb1d3745afd705574166aa6de2ed44
+SHA512 (geeqie-1.7.3.tar.xz) = 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
+Size (geeqie-1.7.3.tar.xz) = 1949696 bytes
+SHA1 (patch-ac) = df54d39df0ba883759e17e0614a203d6a119f7db

Index: pkgsrc/graphics/geeqie/patches/patch-ac
diff -u pkgsrc/graphics/geeqie/patches/patch-ac:1.6 pkgsrc/graphics/geeqie/patches/patch-ac:1.7
--- pkgsrc/graphics/geeqie/patches/patch-ac:1.6 Mon Jan 11 18:18:58 2021
+++ pkgsrc/graphics/geeqie/patches/patch-ac     Fri May 20 12:03:08 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2021/01/11 18:18:58 gdt Exp $
+$NetBSD: patch-ac,v 1.7 2022/05/20 12:03:08 wiz Exp $
 
 * first hunk
 
@@ -9,22 +9,17 @@ Comment from 2009/07/24:
 
 This is not known to be reported upstream.
 
-* second hunk
-
-Avoid clutter crash.  Cherrypicked from upstream:
-  https://github.com/BestImageViewer/geeqie/commit/f34ea0700048c27319a2256408171adda32a7580
-
---- src/main.c.orig    2020-11-20 21:36:33.000000000 +0000
+--- src/main.c.orig    2022-04-12 09:46:17.000000000 +0000
 +++ src/main.c
-@@ -873,6 +873,7 @@ void exit_program(void)
+@@ -1223,6 +1223,7 @@ void exit_program(void)
   */
- /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
+ /** @FIXME this probably needs some better ifdefs. Please report any compilation problems */
  
 +#if 0
  #if defined(SIGBUS) && defined(SA_SIGINFO)
  static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
  {
-@@ -881,9 +882,11 @@ static void sigbus_handler_cb(int signum
+@@ -1231,9 +1232,11 @@ static void sigbus_handler_cb(int signum
        mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
  }
  #endif
@@ -36,23 +31,11 @@ Avoid clutter crash.  Cherrypicked from 
  #if defined(SIGBUS) && defined(SA_SIGINFO)
        struct sigaction sigbus_action;
        sigfillset(&sigbus_action.sa_mask);
-@@ -892,6 +895,7 @@ static void setup_sigbus_handler(void)
+@@ -1242,6 +1245,7 @@ static void setup_sigbus_handler(void)
  
        sigaction(SIGBUS, &sigbus_action, NULL);
  #endif
 +#endif /* 0 */
  }
  
- gint main(gint argc, gchar *argv[])
-@@ -905,11 +909,6 @@ gint main(gint argc, gchar *argv[])
- #if !GLIB_CHECK_VERSION(2,32,0)
-       g_thread_init(NULL);
- #endif
--#ifdef HAVE_CLUTTER
--/* FIXME: see below */
--      putenv("LIBGL_ALWAYS_INDIRECT=1");
--      XInitThreads();
--#endif
-       gdk_threads_init();
-       gdk_threads_enter();
- 
+ static void set_theme_bg_color()