Sat Jun 17 16:50:54 2023 UTC ()
geeqie: add upstream bug report URLs


(wiz)
diff -r1.109 -r1.110 pkgsrc/graphics/geeqie/Makefile
diff -r1.31 -r1.32 pkgsrc/graphics/geeqie/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc
diff -r1.1 -r1.2 pkgsrc/graphics/geeqie/patches/patch-src_misc.cc
cvs diff -r1.109 -r1.110 pkgsrc/graphics/geeqie/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/Makefile 2023/06/17 16:45:43 1.109
+++ pkgsrc/graphics/geeqie/Makefile 2023/06/17 16:50:53 1.110
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.109 2023/06/17 16:45:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.110 2023/06/17 16:50:53 wiz Exp $
2 2
3DISTNAME= geeqie-2.1 3DISTNAME= geeqie-2.1
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_GITHUB:=BestImageViewer/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=BestImageViewer/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://www.geeqie.org/ 10HOMEPAGE= http://www.geeqie.org/
11COMMENT= Image viewer 11COMMENT= Image viewer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 14TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
15# .../geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh: xxd: not found 15# .../geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh: xxd: not found
16TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share 16TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
17 17
18LDFLAGS.SunOS+= -lm -lsocket -lnsl 18LDFLAGS.SunOS+= -lm -lsocket -lnsl
19# ld: src/geeqie.p/main.cc.o: undefined reference to symbol 'backtrace' 19# ld: src/geeqie.p/main.cc.o: undefined reference to symbol 'backtrace'
20# ld: /usr/lib/libexecinfo.so.0: error adding symbols: DSO missing from command line 20# ld: /usr/lib/libexecinfo.so.0: error adding symbols: DSO missing from command line
 21# https://github.com/BestImageViewer/geeqie/issues/1111
21LDFLAGS.NetBSD+= -lexecinfo 22LDFLAGS.NetBSD+= -lexecinfo
22 23
23MESON_ARGS+= -Ddoxygen=disabled 24MESON_ARGS+= -Ddoxygen=disabled
24 25
25USE_PKGLOCALEDIR= yes 26USE_PKGLOCALEDIR= yes
26USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
27USE_TOOLS= bash:run msgfmt pkg-config 28USE_TOOLS= bash:run msgfmt pkg-config
28 29
29REPLACE_BASH+= plugins/*/* 30REPLACE_BASH+= plugins/*/*
30REPLACE_BASH+= doc/*.sh 31REPLACE_BASH+= doc/*.sh
31REPLACE_BASH+= g*.sh 32REPLACE_BASH+= g*.sh
32REPLACE_BASH+= version.sh 33REPLACE_BASH+= version.sh
33 34
cvs diff -r1.31 -r1.32 pkgsrc/graphics/geeqie/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/distinfo 2023/06/17 16:45:43 1.31
+++ pkgsrc/graphics/geeqie/distinfo 2023/06/17 16:50:53 1.32
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.31 2023/06/17 16:45:43 wiz Exp $ 1$NetBSD: distinfo,v 1.32 2023/06/17 16:50:53 wiz Exp $
2 2
3BLAKE2s (geeqie-2.1.tar.xz) = 179c98a22e51fcc7cbe7f9832f1a0902abbf3c8ef688a809bd24ba2cef82cbc1 3BLAKE2s (geeqie-2.1.tar.xz) = 179c98a22e51fcc7cbe7f9832f1a0902abbf3c8ef688a809bd24ba2cef82cbc1
4SHA512 (geeqie-2.1.tar.xz) = 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f 4SHA512 (geeqie-2.1.tar.xz) = 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
5Size (geeqie-2.1.tar.xz) = 1800612 bytes 5Size (geeqie-2.1.tar.xz) = 1800612 bytes
6SHA1 (patch-src_exif-common.cc) = 2752f7c95aff03cf2ff268c4f2cbe09656ca3867 6SHA1 (patch-src_exif-common.cc) = 3d3bb4963a71d3d138287aa418c86455f73734e0
7SHA1 (patch-src_misc.cc) = ccf039c570f04998691d05da891ce18072c08d63 7SHA1 (patch-src_misc.cc) = 8b5ed531aa5bd15dfd296329c623d3fe9d7229eb
cvs diff -r1.1 -r1.2 pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc 2023/06/17 16:45:43 1.1
+++ pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc 2023/06/17 16:50:53 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-src_exif-common.cc,v 1.1 2023/06/17 16:45:43 wiz Exp $ 1$NetBSD: patch-src_exif-common.cc,v 1.2 2023/06/17 16:50:53 wiz Exp $
2 2
3../src/exif-common.cc:780:3: error: 'setenv' was not declared in this scope; did you mean 'getenv'?  3../src/exif-common.cc:780:3: error: 'setenv' was not declared in this scope; did you mean 'getenv'?
 4https://github.com/BestImageViewer/geeqie/pull/1110
4 5
5--- src/exif-common.cc.orig 2023-06-17 12:12:30.000000000 +0000 6--- src/exif-common.cc.orig 2023-06-17 12:12:30.000000000 +0000
6+++ src/exif-common.cc 7+++ src/exif-common.cc
7@@ -19,6 +19,8 @@ 8@@ -19,6 +19,8 @@
8  9
9 #include <config.h> 10 #include <config.h>
10  11
11+#include <stdlib.h> 12+#include <stdlib.h>
12+ 13+
13 #define _XOPEN_SOURCE 14 #define _XOPEN_SOURCE
14  15
15 #include <string.h> 16 #include <string.h>
cvs diff -r1.1 -r1.2 pkgsrc/graphics/geeqie/patches/patch-src_misc.cc (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/patch-src_misc.cc 2023/06/17 16:45:43 1.1
+++ pkgsrc/graphics/geeqie/patches/patch-src_misc.cc 2023/06/17 16:50:53 1.2
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: patch-src_misc.cc,v 1.1 2023/06/17 16:45:43 wiz Exp $ 1$NetBSD: patch-src_misc.cc,v 1.2 2023/06/17 16:50:53 wiz Exp $
2 2
3../src/misc.cc: In function 'gint date_get_first_day_of_week()': 3../src/misc.cc: In function 'gint date_get_first_day_of_week()':
4../src/misc.cc:262:29: error: 'LC_ALL' was not declared in this scope; did you mean 'P_ALL'? 4../src/misc.cc:262:29: error: 'LC_ALL' was not declared in this scope; did you mean 'P_ALL'?
5 262 | current_locale = setlocale(LC_ALL, NULL); 5 262 | current_locale = setlocale(LC_ALL, NULL);
6 | ^~~~~~ 6 | ^~~~~~
7 | P_ALL 7 | P_ALL
8../src/misc.cc:262:19: error: 'setlocale' was not declared in this scope; did you mean '_locale'? 8../src/misc.cc:262:19: error: 'setlocale' was not declared in this scope; did you mean '_locale'?
9 262 | current_locale = setlocale(LC_ALL, NULL); 9 262 | current_locale = setlocale(LC_ALL, NULL);
10 | ^~~~~~~~~ 10 | ^~~~~~~~~
11 | _locale 11 | _locale
 12https://github.com/BestImageViewer/geeqie/pull/1110
12 13
13--- src/misc.cc.orig 2023-06-17 12:12:30.000000000 +0000 14--- src/misc.cc.orig 2023-06-17 12:12:30.000000000 +0000
14+++ src/misc.cc 15+++ src/misc.cc
15@@ -18,6 +18,8 @@ 16@@ -18,6 +18,8 @@
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17 */ 18 */
18  19
19+#include <locale.h> 20+#include <locale.h>
20+ 21+
21 #include "main.h" 22 #include "main.h"
22 #include "misc.h" 23 #include "misc.h"
23  24