Thu Sep 10 19:06:57 2015 UTC ()
Update to 1.2.2.

(1.2.2 and 1.2.1 are build nits)

Geeqie 1.2
==========

- Support for lcms2
- Basic support for lua scripting (still documentation needed)
- Several bugfixes


(gdt)
diff -r1.49 -r1.50 pkgsrc/graphics/geeqie/Makefile
diff -r1.7 -r1.8 pkgsrc/graphics/geeqie/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/geeqie/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/graphics/geeqie/patches/patch-ac
diff -r0 -r1.1 pkgsrc/graphics/geeqie/patches/patch-configure
cvs diff -r1.49 -r1.50 pkgsrc/graphics/geeqie/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/Makefile 2015/04/25 14:23:10 1.49
+++ pkgsrc/graphics/geeqie/Makefile 2015/09/10 19:06:57 1.50
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:10 tnn Exp $ 1# $NetBSD: Makefile,v 1.50 2015/09/10 19:06:57 gdt Exp $
2# 2#
3 3
4DISTNAME= geeqie-1.1 4DISTNAME= geeqie-1.2.2
5PKGREVISION= 24 5EXTRACT_SUFX= .tar.xz
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geeqie/} 7MASTER_SITES= http://www.geeqie.org/
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://geeqie.sourceforge.net/ 10HOMEPAGE= http://www.geeqie.org/
11COMMENT= Image viewer 11COMMENT= Image viewer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15 15
16LDFLAGS.SunOS+= -lm -lsocket -lnsl 16LDFLAGS.SunOS+= -lm -lsocket -lnsl
17 17
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_TOOLS= bash:run gmake intltool msgfmt pkg-config 20USE_TOOLS= bash:run gmake intltool msgfmt pkg-config
21 21
22REPLACE_BASH= plugins/rotate/geeqie-rotate 22REPLACE_BASH= plugins/rotate/geeqie-rotate
23REPLACE_BASH+= plugins/ufraw/geeqie-ufraw 23REPLACE_BASH+= plugins/ufraw/geeqie-ufraw
cvs diff -r1.7 -r1.8 pkgsrc/graphics/geeqie/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/distinfo 2012/08/28 00:30:44 1.7
+++ pkgsrc/graphics/geeqie/distinfo 2015/09/10 19:06:57 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2012/08/28 00:30:44 gdt Exp $ 1$NetBSD: distinfo,v 1.8 2015/09/10 19:06:57 gdt Exp $
2 2
3SHA1 (geeqie-1.1.tar.gz) = 77167479e91e03d9512535a146c5d2d77941257f 3SHA1 (geeqie-1.2.2.tar.xz) = 9dd094707d7bf7389eb62a218ff7bc86339fc995
4RMD160 (geeqie-1.1.tar.gz) = 060c62c3db32fe4bc05aa6dccd052360d3aac3cf 4RMD160 (geeqie-1.2.2.tar.xz) = 45e301763f3c174aa664254037ede7a9a508f179
5Size (geeqie-1.1.tar.gz) = 1966211 bytes 5Size (geeqie-1.2.2.tar.xz) = 1156616 bytes
6SHA1 (patch-ab) = a2aa37f813b32b216410515e6e80fe8fdc9c6803 6SHA1 (patch-ab) = 6c60aa3ca9e623525cdb6c282c02ed477ecb8b6d
7SHA1 (patch-ac) = 531d7338f1c42c62a738aa8fb4253b3324e71458 7SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
 8SHA1 (patch-configure) = 0923c577fbe92c6cbf8ec429dd5c149423a649f3
cvs diff -r1.5 -r1.6 pkgsrc/graphics/geeqie/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/Attic/patch-ab 2012/08/28 00:30:45 1.5
+++ pkgsrc/graphics/geeqie/patches/Attic/patch-ab 2015/09/10 19:06:57 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ab,v 1.5 2012/08/28 00:30:45 gdt Exp $ 1$NetBSD: patch-ab,v 1.6 2015/09/10 19:06:57 gdt Exp $
2 2
3Generate html docs in build phase (instead of install phase). 3Generate html docs in build phase (instead of install phase).
4gnome-doc-tool seems to ignore "-o html" so manually generate 4gnome-doc-tool seems to ignore "-o html" so manually generate
5the same effect. 5the same effect.
6 6
7Solves PLIST problem due to missing html files. 7Solves PLIST problem due to missing html files.
8 8
9This is not know to be reported upstream. 9This is not know to be reported upstream.
10 10
11--- doc/Makefile.in.orig 2010-09-25 12:02:12.000000000 +0000 11--- doc/Makefile.in.orig 2015-09-10 14:28:35.000000000 +0000
12+++ doc/Makefile.in 12+++ doc/Makefile.in
13@@ -408,7 +408,7 @@ uninstall-am: uninstall-helpDATA 13@@ -496,7 +496,7 @@ uninstall-am:
14 html/GuideIndex.html: docbook/GuideIndex.xml 14 html/GuideIndex.html: docbook/GuideIndex.xml
15 rm -rf html; mkdir html 15 rm -rf html; mkdir html
16 if [ -x "$(GNOME_DOC_TOOL)" ]; then \ 16 if [ -x "$(GNOME_DOC_TOOL)" ]; then \
17- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ 17- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
18+ cd html && "$(GNOME_DOC_TOOL)" html ../$(srcdir)/docbook/GuideIndex.xml ; \ 18+ cd html && "$(GNOME_DOC_TOOL)" html ../$(srcdir)/docbook/GuideIndex.xml ; \
19 else \ 19 else \
20 echo "gnome-doc-tool not found, html is not built" ; \ 20 echo "gnome-doc-tool not found, html is not built" ; \
21 fi 21 fi
cvs diff -r1.4 -r1.5 pkgsrc/graphics/geeqie/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/Attic/patch-ac 2012/08/28 00:30:45 1.4
+++ pkgsrc/graphics/geeqie/patches/Attic/patch-ac 2015/09/10 19:06:57 1.5
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ac,v 1.4 2012/08/28 00:30:45 gdt Exp $ 1$NetBSD: patch-ac,v 1.5 2015/09/10 19:06:57 gdt Exp $
2 2
3Comment from 2009/07/24: 3Comment from 2009/07/24:
4 4
5 disable the SIGBUS handler completely -- as implemented it can only 5 disable the SIGBUS handler completely -- as implemented it can only
6 cause trouble 6 cause trouble
7 7
8This is not known to be reported upstream. 8This is not known to be reported upstream.
9 9
10--- src/main.c.orig 2010-02-17 21:21:19.000000000 +0000 10--- src/main.c.orig 2015-05-23 12:20:43.000000000 +0000
11+++ src/main.c 11+++ src/main.c
12@@ -709,6 +709,7 @@ void exit_program(void) 12@@ -709,6 +709,7 @@ void exit_program(void)
13 */ 13 */
14 /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */ 14 /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
15  15
16+#if 0 16+#if 0
17 #if defined(SIGBUS) && defined(SA_SIGINFO) 17 #if defined(SIGBUS) && defined(SA_SIGINFO)
18 static void sigbus_handler_cb(int signum, siginfo_t *info, void *context) 18 static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
19 { 19 {
20@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum 20@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum
21 mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 21 mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
22 } 22 }
23 #endif 23 #endif
File Added: pkgsrc/graphics/geeqie/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2015/09/10 19:06:57 gdt Exp $

Fix bashisms.
Reported upstream 20150910.

--- configure.orig	2015-09-10 14:28:36.000000000 +0000
+++ configure
@@ -9146,7 +9146,7 @@ else
 fi
 
 
-if test x$gtk3 == xyes; then
+if test x$gtk3 = xyes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Gtk3 enabled\"" >&5
 $as_echo "$as_me: WARNING: \"Gtk3 enabled\"" >&2;}
 
@@ -9158,7 +9158,7 @@ $as_echo "$as_me: WARNING: \"Gtk3 is pre
     fi
 fi
 
-if test x$gtk3 == xno; then
+if test x$gtk3 = xno; then
     # Check whether --enable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;