CVS commit: pkgsrc/graphics/geeqie

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 18 12:13:29 UTC 2023

Modified Files:
        pkgsrc/graphics/geeqie: Makefile distinfo
Added Files:
        pkgsrc/graphics/geeqie/patches: patch-meson.build patch-src_meson.build

Log Message:
geeqie: fix missing library issue using patch submitted upstream


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/geeqie/patches/patch-meson.build
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/geeqie/patches/patch-src_meson.build

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.110 pkgsrc/graphics/geeqie/Makefile:1.111
--- pkgsrc/graphics/geeqie/Makefile:1.110       Sat Jun 17 16:50:53 2023
+++ pkgsrc/graphics/geeqie/Makefile     Sun Jun 18 12:13:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2023/06/17 16:50:53 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2023/06/18 12:13:28 wiz Exp $
 
 DISTNAME=      geeqie-2.1
 CATEGORIES=    graphics
@@ -16,10 +16,6 @@ TOOL_DEPENDS+=       gettext-m4-[0-9]*:../../d
 TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
 
 LDFLAGS.SunOS+=                -lm -lsocket -lnsl
-# ld: src/geeqie.p/main.cc.o: undefined reference to symbol 'backtrace'
-# ld: /usr/lib/libexecinfo.so.0: error adding symbols: DSO missing from command line
-# https://github.com/BestImageViewer/geeqie/issues/1111
-LDFLAGS.NetBSD+=       -lexecinfo
 
 MESON_ARGS+=   -Ddoxygen=disabled
 

Index: pkgsrc/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.32 pkgsrc/graphics/geeqie/distinfo:1.33
--- pkgsrc/graphics/geeqie/distinfo:1.32        Sat Jun 17 16:50:53 2023
+++ pkgsrc/graphics/geeqie/distinfo     Sun Jun 18 12:13:28 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.32 2023/06/17 16:50:53 wiz Exp $
+$NetBSD: distinfo,v 1.33 2023/06/18 12:13:28 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

Added files:

Index: pkgsrc/graphics/geeqie/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-meson.build:1.3
--- /dev/null   Sun Jun 18 12:13:29 2023
+++ pkgsrc/graphics/geeqie/patches/patch-meson.build    Sun Jun 18 12:13:28 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.3 2023/06/18 12:13:28 wiz Exp $
+
+https://github.com/BestImageViewer/geeqie/issues/1111
+
+--- meson.build.orig   2023-06-17 12:12:30.000000000 +0000
++++ meson.build
+@@ -190,6 +190,7 @@ option = get_option('execinfo')
+ if not option.disabled()
+     result = cc.check_header('execinfo.h')
+     if result
++        libexecinfo_dep = cc.find_library('execinfo', required : false)
+         conf_data.set('HAVE_EXECINFO_H', 1)
+         summary({'execinfo' : ['stacktrace supported:', true]}, section : 'Debugging', bool_yn : true)
+     else

Index: pkgsrc/graphics/geeqie/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-src_meson.build:1.1
--- /dev/null   Sun Jun 18 12:13:29 2023
+++ pkgsrc/graphics/geeqie/patches/patch-src_meson.build        Sun Jun 18 12:13:28 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_meson.build,v 1.1 2023/06/18 12:13:28 wiz Exp $
+
+https://github.com/BestImageViewer/geeqie/issues/1111
+
+--- src/meson.build.orig       2023-06-17 12:12:30.000000000 +0000
++++ src/meson.build
+@@ -281,6 +281,7 @@ gspell_dep,
+ lcms_dep,
+ libarchive_dep,
+ libdw_dep,
++libexecinfo_dep,
+ libffmpegthumbnailer_dep,
+ libheif_dep,
+ libjpeg_dep,