Update to 1.5

Changelog:
Geeqie 1.5
==========

- Partial implementation of Hi-DPI-aware rendering of images
- Improved multi display full screen
- Use GPS lat/long to provide local time corrected for UTC offset and DST correction.
- Marks/image connections can optionally be saved in a text file
- Show star rating
- Search using regular expressions
- Replace GQView print dialog with GTK print dialog
- Plugins added
- Option to delete to standard trash folder and optimizing trash handling
- Display random image
- Allow LUA script support in sidebar
- Additional remote commands

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

8 files changed, 71 insertions, 156 deletions

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index f4700395c1a..3d2c4c96f87 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2019/07/26 09:46:41 nia Exp $
+# $NetBSD: Makefile,v 1.80 2019/07/30 13:03:18 ryoon Exp $
 
-DISTNAME=	geeqie-1.4
-PKGREVISION=	12
+DISTNAME=	geeqie-1.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/
 EXTRACT_SUFX=	.tar.xz
@@ -19,9 +18,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS=		bash:run gmake intltool msgfmt pkg-config automake autoconf autoreconf
 
-REPLACE_BASH=		plugins/rotate/geeqie-rotate
-REPLACE_BASH+=		plugins/ufraw/geeqie-ufraw
-REPLACE_BASH+=		plugins/import/geeqie-import
+REPLACE_BASH+=		plugins/*/*
 REPLACE_BASH+=		gen_changelog.sh
 
 pre-configure:
diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST
index 2a2df069cd8..ec73f33c28d 100644
--- a/graphics/geeqie/PLIST
+++ b/graphics/geeqie/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2018/01/10 09:38:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/07/30 13:03:18 ryoon Exp $
 bin/geeqie
-lib/geeqie/geeqie-import
+lib/geeqie/geeqie-camera-import
+lib/geeqie/geeqie-camera-import-hook-script
+lib/geeqie/geeqie-export-jpeg
+lib/geeqie/geeqie-image-crop
+lib/geeqie/geeqie-random-image
 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
 man/man1/geeqie.1
@@ -31,6 +37,7 @@ share/doc/${PKGNAME}/html/GuideImagePresentation.html
 share/doc/${PKGNAME}/html/GuideImagePresentationFullscreen.html
 share/doc/${PKGNAME}/html/GuideImagePresentationSlideshow.html
 share/doc/${PKGNAME}/html/GuideImageSearch.html
+share/doc/${PKGNAME}/html/GuideImageSearchCache.html
 share/doc/${PKGNAME}/html/GuideImageSearchFindingDuplicates.html
 share/doc/${PKGNAME}/html/GuideImageSearchSearch.html
 share/doc/${PKGNAME}/html/GuideIndex-info.html
@@ -53,9 +60,11 @@ share/doc/${PKGNAME}/html/GuideOptionsGeneral.html
 share/doc/${PKGNAME}/html/GuideOptionsHidden.html
 share/doc/${PKGNAME}/html/GuideOptionsImage.html
 share/doc/${PKGNAME}/html/GuideOptionsKeyboard.html
+share/doc/${PKGNAME}/html/GuideOptionsKeywords.html
 share/doc/${PKGNAME}/html/GuideOptionsLayout.html
 share/doc/${PKGNAME}/html/GuideOptionsMain.html
 share/doc/${PKGNAME}/html/GuideOptionsMetadata.html
+share/doc/${PKGNAME}/html/GuideOptionsOSD.html
 share/doc/${PKGNAME}/html/GuideOptionsStereo.html
 share/doc/${PKGNAME}/html/GuideOptionsToolbar.html
 share/doc/${PKGNAME}/html/GuideOptionsWindow.html
@@ -74,10 +83,13 @@ share/doc/${PKGNAME}/html/GuideReferenceLIRC.html
 share/doc/${PKGNAME}/html/GuideReferenceLua.html
 share/doc/${PKGNAME}/html/GuideReferenceManagement.html
 share/doc/${PKGNAME}/html/GuideReferenceMetadata.html
+share/doc/${PKGNAME}/html/GuideReferencePCRE.html
 share/doc/${PKGNAME}/html/GuideReferencePixbufLoaders.html
+share/doc/${PKGNAME}/html/GuideReferenceStandardPlugins.html
 share/doc/${PKGNAME}/html/GuideReferenceStandards.html
 share/doc/${PKGNAME}/html/GuideReferenceSupportedFormats.html
 share/doc/${PKGNAME}/html/GuideReferenceThumbnails.html
+share/doc/${PKGNAME}/html/GuideReferenceUTC.html
 share/doc/${PKGNAME}/html/GuideReferenceXmpExif.html
 share/doc/${PKGNAME}/html/GuideSidebars.html
 share/doc/${PKGNAME}/html/GuideSidebarsInfo.html
@@ -122,13 +134,16 @@ share/doc/${PKGNAME}/html/zoom-fit-best.png
 share/doc/${PKGNAME}/html/zoom-in.png
 share/doc/${PKGNAME}/html/zoom-original.png
 share/doc/${PKGNAME}/html/zoom-out.png
-share/geeqie/applications/geeqie-import-geeqie.desktop
-share/geeqie/applications/geeqie-import-gqview.desktop
+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
 share/geeqie/applications/symlink.desktop
+share/geeqie/applications/tethered-photography.desktop
 share/geeqie/template.desktop
 share/locale/ar/LC_MESSAGES/geeqie.mo
 share/locale/be/LC_MESSAGES/geeqie.mo
@@ -138,6 +153,7 @@ share/locale/cs/LC_MESSAGES/geeqie.mo
 share/locale/da/LC_MESSAGES/geeqie.mo
 share/locale/de/LC_MESSAGES/geeqie.mo
 share/locale/el/LC_MESSAGES/geeqie.mo
+share/locale/en_GB/LC_MESSAGES/geeqie.mo
 share/locale/eo/LC_MESSAGES/geeqie.mo
 share/locale/es/LC_MESSAGES/geeqie.mo
 share/locale/et/LC_MESSAGES/geeqie.mo
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index 49301d3dd96..2abce727510 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2019/07/17 00:16:49 nia Exp $
+$NetBSD: distinfo,v 1.14 2019/07/30 13:03:18 ryoon Exp $
 
-SHA1 (geeqie-1.4.tar.xz) = bef0e6c6a0aba8b957375087bcb570cb9dac64b1
-RMD160 (geeqie-1.4.tar.xz) = 1e3ffccba08edc2739051f1252ca653f008de35b
-SHA512 (geeqie-1.4.tar.xz) = a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
-Size (geeqie-1.4.tar.xz) = 35881152 bytes
+SHA1 (geeqie-1.5.tar.xz) = c7dd9372a497714e8aa52b42e1caad8a96fad030
+RMD160 (geeqie-1.5.tar.xz) = 663e2c3510ca2e79e44daa5ecf8ef72869633c59
+SHA512 (geeqie-1.5.tar.xz) = 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
+Size (geeqie-1.5.tar.xz) = 1585780 bytes
 SHA1 (patch-Makefile.am) = 49aba28dcb6a3671550ddab5c80d93f3a094d47f
 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
-SHA1 (patch-configure.in) = d606bab2b701a48af92fc90404740d9a16492e44
 SHA1 (patch-doc_Makefile.am) = 9ffbcd6f8e5bc5710b61dfbfb020e92497d3414f
-SHA1 (patch-src_exiv2.cc) = 67a08c87fe66defb1c43b509b1069b591943559d
-SHA1 (patch-src_layout__util.c) = cb5d82d7c02690fcad6ef8139788100928d03ac1
+SHA1 (patch-src_layout__util.c) = c7ee3ea2e9874e32df21ebecad22758d9ccc17c3
+SHA1 (patch-src_misc.c) = ce18eb36b6bd31b99b190f4d4377cd50db67abba
+SHA1 (patch-src_pan-view_pan-util.c) = ac965257003cd9da5dbd0c2f2452ed50a5889021
diff --git a/graphics/geeqie/patches/patch-configure.in b/graphics/geeqie/patches/patch-configure.in
deleted file mode 100644
index c1e02cbe262..00000000000
--- a/graphics/geeqie/patches/patch-configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-configure.in,v 1.2 2018/01/10 09:38:32 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- configure.in.orig	2017-12-31 12:31:21.000000000 +0000
-+++ configure.in
-@@ -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([--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.))])
- fi
- 
--if test x$gtk3 == xno; then
-+if test x$gtk3 = xno; then
-     m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))])
-     true
- fi
diff --git a/graphics/geeqie/patches/patch-src_exiv2.cc b/graphics/geeqie/patches/patch-src_exiv2.cc
deleted file mode 100644
index 73cb9774279..00000000000
--- a/graphics/geeqie/patches/patch-src_exiv2.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-src_exiv2.cc,v 1.1 2019/07/17 00:16:50 nia Exp $
-
-Fix building with exiv2-0.27
-
-Upstream commit:
-https://github.com/BestImageViewer/geeqie/commit/f9213c8ad796cf4571b2606435c32753040ec645.patch
-
---- src/exiv2.cc.orig	2017-12-31 12:31:21.000000000 +0000
-+++ src/exiv2.cc
-@@ -22,17 +22,25 @@
- 
- #ifdef HAVE_EXIV2
- 
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+// Don't include the <exiv2/version.hpp> file directly
-+// Early Exiv2 versions didn't have version.hpp and the macros.
-+#include <exiv2/exiv2.hpp>
- #include <iostream>
- #include <string>
- 
- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
-+#ifdef EXIV2_VERSION
- #ifndef EXIV2_TEST_VERSION
--# define EXIV2_TEST_VERSION(major,minor,patch) \
-+#define EXIV2_TEST_VERSION(major,minor,patch) \
- 	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
- #endif
-+#else
-+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
-+#endif
- 
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define HAVE_EXIV2_ERROR_CODE
-+#endif
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -40,27 +48,8 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- 
--#if !EXIV2_TEST_VERSION(0,17,90)
--#include <exiv2/tiffparser.hpp>
--#include <exiv2/tiffcomposite.hpp>
--#include <exiv2/tiffvisitor.hpp>
--#include <exiv2/tiffimage.hpp>
--#include <exiv2/cr2image.hpp>
--#include <exiv2/crwimage.hpp>
--#if EXIV2_TEST_VERSION(0,16,0)
--#include <exiv2/orfimage.hpp>
--#endif
--#if EXIV2_TEST_VERSION(0,13,0)
--#include <exiv2/rafimage.hpp>
--#endif
--#include <exiv2/futils.hpp>
--#else
--#include <exiv2/preview.hpp>
--#endif
--
--#if EXIV2_TEST_VERSION(0,17,0)
--#include <exiv2/convert.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define EXV_PACKAGE "exiv2"
- #endif
- 
- extern "C" {
-@@ -374,7 +363,11 @@ public:
- #endif
- 			Exiv2::Image *image = imageData_->image();
- 
--			if (!image) Exiv2::Error(21);
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
-+#else
-+ 			if (!image) throw Exiv2::Error(21);
-+#endif
- 			image->setExifData(exifData_);
- 			image->setIptcData(iptcData_);
- #if EXIV2_TEST_VERSION(0,16,0)
-@@ -394,8 +387,12 @@ public:
- 			sidecar->setXmpData(xmpData_);
- 			sidecar->writeMetadata();
- #else
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
-+#else
- 			throw Exiv2::Error(3, "xmp");
- #endif
-+#endif
- 			}
- 	}
- 
diff --git a/graphics/geeqie/patches/patch-src_layout__util.c b/graphics/geeqie/patches/patch-src_layout__util.c
index 086a6ca71fb..6472a6971c1 100644
--- a/graphics/geeqie/patches/patch-src_layout__util.c
+++ b/graphics/geeqie/patches/patch-src_layout__util.c
@@ -1,9 +1,6 @@
-$NetBSD: patch-src_layout__util.c,v 1.1 2018/01/10 09:38:32 wiz Exp $
+$NetBSD: patch-src_layout__util.c,v 1.2 2019/07/30 13:03:18 ryoon 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
+For WEXITSTATUS().
 
 --- src/layout_util.c.orig	2017-12-31 12:31:21.000000000 +0000
 +++ src/layout_util.c
@@ -15,21 +12,3 @@ layout_util.c:516:16: error: lvalue required as unary '&' operand
  #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;
diff --git a/graphics/geeqie/patches/patch-src_misc.c b/graphics/geeqie/patches/patch-src_misc.c
new file mode 100644
index 00000000000..dc2eb1b33ed
--- /dev/null
+++ b/graphics/geeqie/patches/patch-src_misc.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_misc.c,v 1.1 2019/07/30 13:03:18 ryoon Exp $
+
+* _NL_TIME_FIRST_WEEKDAY is not universal and return Sunday=1 instead.
+
+--- src/misc.c.orig	2019-07-26 18:19:11.000000000 +0000
++++ src/misc.c
+@@ -249,7 +249,11 @@ int runcmd(gchar *cmd)
+  */
+ gint date_get_first_day_of_week()
+ {
++#if defined(_NL_TIME_FIRST_WEEKDAY)
+ 	return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0];
++#else
++	return 1;
++#endif
+ }
+ 
+ /**
diff --git a/graphics/geeqie/patches/patch-src_pan-view_pan-util.c b/graphics/geeqie/patches/patch-src_pan-view_pan-util.c
new file mode 100644
index 00000000000..3744fc0e828
--- /dev/null
+++ b/graphics/geeqie/patches/patch-src_pan-view_pan-util.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_pan-view_pan-util.c,v 1.1 2019/07/30 13:03:18 ryoon Exp $
+
+* __GLIBC_PREREQ is not universal.
+
+--- src/pan-view/pan-util.c.orig	2019-07-26 18:19:11.000000000 +0000
++++ src/pan-view/pan-util.c
+@@ -99,8 +99,12 @@ gchar *pan_date_value_string(time_t d, P
+ 			format = "%A %e";
+ 			break;
+ 		case PAN_DATE_LENGTH_MONTH:
+-#if __GLIBC_PREREQ(2, 27)
++#if defined(__GLIBC_PREREQ)
++#  if __GLIBC_PREREQ(2, 27)
+ 			format = "%OB %Y";
++#  else
++			format = "%B %Y";
++#  endif
+ #else
+ 			format = "%B %Y";
+ #endif