geeqie: update to 1.4.

Geeqie 1.4
==========

- Improvement of GTK3 implementation
- Improved marks workflow
- Animate gifs (via context menu or key A)
- Compiles with gcc and clang
- Rectangular selections (activated by Alt-R)
- Folder bookmarks
- Search via geo position
- Thumbnail preview in dialogues
- Customisable tool bar
- Slideshow speed customisable while playing
- Many usability improvements
- Language updates
- Many small improvements
- Many bugfixes as usual

4 files changed, 60 insertions, 10 deletions

diff --git a/graphics/geeqie/patches/patch-Makefile.am b/graphics/geeqie/patches/patch-Makefile.am
new file mode 100644
index 00000000000..e54dc0239bd
--- /dev/null
+++ b/graphics/geeqie/patches/patch-Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile.am,v 1.1 2018/01/10 09:38:32 wiz Exp $
+
+ChangeLog files are not in distfile.
+
+--- Makefile.am.orig	2017-12-31 12:31:21.000000000 +0000
++++ Makefile.am
+@@ -10,9 +10,9 @@ man_MANS = geeqie.1
+ readmedir = @readmedir@
+ 
+ if HAVE_MARKDOWN
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS
+ endif
+ 
+ desktopdir = $(datadir)/applications
diff --git a/graphics/geeqie/patches/patch-configure.in b/graphics/geeqie/patches/patch-configure.in
index 3304d3df74f..c1e02cbe262 100644
--- a/graphics/geeqie/patches/patch-configure.in
+++ b/graphics/geeqie/patches/patch-configure.in
@@ -1,20 +1,17 @@
-$NetBSD: patch-configure.in,v 1.1 2016/04/17 09:45:59 wiz Exp $
+$NetBSD: patch-configure.in,v 1.2 2018/01/10 09:38:32 wiz Exp $
 
 Fix unportable test(1) operator.
 
---- configure.in.orig	2016-03-07 10:21:06.000000000 +0000
+--- configure.in.orig	2017-12-31 12:31:21.000000000 +0000
 +++ configure.in
-@@ -192,7 +192,7 @@ fi
+@@ -200,12 +200,12 @@ fi
  AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
- AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
+ AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])])
  
 -if test x$gtk3 == xyes; then
 +if test x$gtk3 = xyes; then
      AC_MSG_WARN("Gtk3 enabled")
      m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
- else
-@@ -202,7 +202,7 @@ else
-     fi
  fi
  
 -if test x$gtk3 == xno; then
diff --git a/graphics/geeqie/patches/patch-doc_Makefile.am b/graphics/geeqie/patches/patch-doc_Makefile.am
index eb16eb171de..6d1cb7b1981 100644
--- a/graphics/geeqie/patches/patch-doc_Makefile.am
+++ b/graphics/geeqie/patches/patch-doc_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_Makefile.am,v 1.1 2016/04/17 09:45:59 wiz Exp $
+$NetBSD: patch-doc_Makefile.am,v 1.2 2018/01/10 09:38:32 wiz Exp $
 
 Generate html docs in build phase (instead of install phase).
 gnome-doc-tool seems to ignore "-o html" so manually generate
@@ -8,11 +8,11 @@ Solves PLIST problem due to missing html files.
 
 This is not know to be reported upstream.
 
---- doc/Makefile.am.orig	2016-03-07 10:21:06.000000000 +0000
+--- doc/Makefile.am.orig	2017-12-31 12:31:21.000000000 +0000
 +++ doc/Makefile.am
 @@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook
  html/GuideIndex.html: docbook/GuideIndex.xml
- 	rm -rf html; mkdir html
+ 	rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
  	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
 -		"$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
 +		cd html && "$(GNOME_DOC_TOOL)" html $(srcdir)/../docbook/GuideIndex.xml ; \
diff --git a/graphics/geeqie/patches/patch-src_layout__util.c b/graphics/geeqie/patches/patch-src_layout__util.c
new file mode 100644
index 00000000000..086a6ca71fb
--- /dev/null
+++ b/graphics/geeqie/patches/patch-src_layout__util.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_layout__util.c,v 1.1 2018/01/10 09:38:32 wiz Exp $
+
+1. For WEXITSTATUS().
+2. Fix
+layout_util.c: In function 'layout_menu_write_rotate':
+layout_util.c:516:16: error: lvalue required as unary '&' operand
+
+--- src/layout_util.c.orig	2017-12-31 12:31:21.000000000 +0000
++++ src/layout_util.c
+@@ -58,6 +58,7 @@
+ #include "metadata.h"
+ #include "desktop_file.h"
+ 
++#include <sys/wait.h>
+ #include <gdk/gdkkeysyms.h> /* for keyboard values */
+ #include "keymap_template.c"
+ 
+@@ -495,6 +496,7 @@ static void layout_menu_write_rotate(Gtk
+ 
+ 	while (work)
+ 		{
++		int ret;
+ 		if (lw->vf->type == FILEVIEW_ICON)
+ 			{
+ 			fd_n = work->data;
+@@ -512,7 +514,8 @@ static void layout_menu_write_rotate(Gtk
+ 		command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
+ 													keep_date ? " -t " : " ", fd_n->path, NULL);
+ 
+-		run_result = WEXITSTATUS(runcmd(command));
++		ret = runcmd(command);
++		run_result = WEXITSTATUS(ret);
+ 		if (!run_result)
+ 			{
+ 			fd_n->user_orientation = 0;