<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb225b12a570a8d4f0ae0f52901b111582dffa27">https://github.com/macports/macports-ports/commit/fb225b12a570a8d4f0ae0f52901b111582dffa27</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fb225b1 geeqie: Update to 1.4
</span>fb225b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fb225b12a570a8d4f0ae0f52901b111582dffa27
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jun 23 03:07:53 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> geeqie: Update to 1.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add upstream patches to fix build failures.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58627
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> While we're at it, enable clutter and champlain support.
</span>---
graphics/geeqie/Portfile | 35 +++++----
graphics/geeqie/files/578.patch | 16 ++++
graphics/geeqie/files/588.patch | 25 ++++++
graphics/geeqie/files/605.patch | 15 ++++
graphics/geeqie/files/654.patch | 91 ++++++++++++++++++++++
graphics/geeqie/files/675.patch | 24 ++++++
.../geeqie/files/disable-gen_changelog.sh.patch | 15 ++++
graphics/geeqie/files/no-Werror.patch | 15 ++++
graphics/geeqie/files/patch-src-exiv2.cc.diff | 28 -------
9 files changed, 223 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/Portfile b/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86feadd..595d8ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,12 @@
</span> PortSystem 1.0
name geeqie
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1e3ffccba08edc2739051f1252ca653f008de35b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 35881152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories graphics x11
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,40 +16,42 @@ license GPL-2+
</span>
description Geeqie Image Viewer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Geeqie is a lightweight Gtk+ based image viewer for Unix like operating \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Geeqie is a lightweight Gtk+-based image viewer for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIX-like operating systems which was forked from GQView.
</span>
homepage http://www.geeqie.org/
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fd730c5ce969b53e3b5d250f58308ea9b58fd936 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1141820
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:intltool \
port:autoconf \
port:automake \
port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:clutter-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span> port:gtk3 \
port:exiv2 \
port:lcms \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libchamplain \
</span> port:jpeg \
port:tiff
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-exiv2.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append no-Werror.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append disable-gen_changelog.sh.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These patches are taken from the upstream repository and we should be able
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to remove them when the next version is released.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 578.patch 588.patch 605.patch 654.patch 675.patch
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure script included
</span> configure.cmd ./autogen.sh
configure.args --disable-lirc \
--disable-lua \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gps \
</span> --disable-debug-log \
--disable-doxygen-doc \
--disable-doxygen-dot \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +62,10 @@ configure.args --disable-lirc \
</span> --disable-doxygen-chi \
--disable-doxygen-html \
--disable-doxygen-ps \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-doxygen-pdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-doxygen-pdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-map
</span>
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/578.patch b/graphics/geeqie/files/578.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..270977e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/578.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Quote path when writing orientation to file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/578
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/commit/4df045ff82a832dc3d21d10833f36f12687db7f8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/layout_util.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/layout_util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,8 +510,7 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rotation = g_strdup_printf("%d", fd_n->user_orientation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- keep_date ? " -t " : " ", fd_n->path, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ keep_date ? " -t \"" : " \"", fd_n->path, "\"", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ run_result = WEXITSTATUS(runcmd(command));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!run_result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/588.patch b/graphics/geeqie/files/588.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e47ed16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/588.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with Apple Clang 9.0.0+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/pull/589
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/commit/75c7df8b96592e10f7936dc1a28983be4089578c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/layout_util.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/layout_util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -477,6 +477,7 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint run_result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GenericDialog *gd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GString *message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cmdstatus;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!layout_valid(&lw)) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -511,7 +512,8 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rotation = g_strdup_printf("%d", fd_n->user_orientation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keep_date ? " -t \"" : " \"", fd_n->path, "\"", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- run_result = WEXITSTATUS(runcmd(command));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmdstatus = runcmd(command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ run_result = WEXITSTATUS(cmdstatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!run_result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd_n->user_orientation = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/605.patch b/graphics/geeqie/files/605.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..47f4a36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/605.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix crash when writing metadata to .svg files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/commit/e8db929f468d1e635899253db6013ea5d35732fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,7 +374,7 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::Image *image = imageData_->image();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!image) Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!image) throw Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image->setExifData(exifData_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image->setIptcData(iptcData_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if EXIV2_TEST_VERSION(0,16,0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/654.patch b/graphics/geeqie/files/654.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0e7ce65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/654.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with exiv 0.27.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/654
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/pull/655
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/commit/f9213c8ad796cf4571b2606435c32753040ec645
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,17 +22,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_EXIV2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/image.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/exif.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Don't include the <exiv2/version.hpp> file directly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Early Exiv2 versions didn't have version.hpp and the macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <exiv2/exiv2.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef EXIV2_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef EXIV2_TEST_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define EXIV2_TEST_VERSION(major,minor,patch) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXIV2_TEST_VERSION(major,minor,patch) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXIV2_TEST_VERSION(major,minor,patch) (false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if EXIV2_TEST_VERSION(0,27,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,27 +48,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mman.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !EXIV2_TEST_VERSION(0,17,90)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/tiffparser.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/tiffcomposite.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/tiffvisitor.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/tiffimage.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/cr2image.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/crwimage.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if EXIV2_TEST_VERSION(0,16,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/orfimage.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if EXIV2_TEST_VERSION(0,13,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/rafimage.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/futils.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/preview.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if EXIV2_TEST_VERSION(0,17,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/convert.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/xmpsidecar.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if EXIV2_TEST_VERSION(0,27,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXV_PACKAGE "exiv2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,7 +363,11 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::Image *image = imageData_->image();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!image) throw Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image->setExifData(exifData_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image->setIptcData(iptcData_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if EXIV2_TEST_VERSION(0,16,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,8 +386,12 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sidecar->setXmpData(xmpData_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sidecar->writeMetadata();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw Exiv2::Error(3, "xmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/675.patch b/graphics/geeqie/files/675.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c48acd0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/675.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build against exiv2-0.27.1+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/pull/675
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/commit/c220ddefb1b6b11b54f7598f0d44dd0723325ed4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,7 +364,7 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::Image *image = imageData_->image();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!image) throw Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,7 +388,7 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sidecar->writeMetadata();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw Exiv2::Error(Exiv2::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw Exiv2::Error(3, "xmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/disable-gen_changelog.sh.patch b/graphics/geeqie/files/disable-gen_changelog.sh.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..58940f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/disable-gen_changelog.sh.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Make gen_changelog.sh not do anything since it doesn't work unless it's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+run in a git clone.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gen_changelog.sh.orig 2017-12-31 06:31:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gen_changelog.sh 2019-06-23 02:56:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ChangeLog.html is also created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++touch ChangeLog ChangeLog.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++exit 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ ! -e "ChangeLog.gqview" ] && exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ ! -x "$(command -v git)" ] && exit 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/no-Werror.patch b/graphics/geeqie/files/no-Werror.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cc10fb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/files/no-Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use -Werror. We don't want warnings turned into errors since that can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cause the build to fail. See for example:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/BestImageViewer/geeqie/issues/684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2017-12-31 06:31:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2019-06-23 02:25:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PREREQ(2.57)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_INIT([geeqie], 1.4, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Add -Werror to the default CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for rightly dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_SRCDIR([src/main.c])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/patch-src-exiv2.cc.diff b/graphics/geeqie/files/patch-src-exiv2.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc4633f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/patch-src-exiv2.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/exiv2.cc.orig 2016-05-27 02:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/exiv2.cc 2018-12-23 11:02:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/exif.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <exiv2/version.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -358,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Exiv2::Image *image = imageData_->image();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!image) Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!image) Exiv2::Error(Exiv2::kerErrorMessage, 21);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image->setExifData(exifData_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image->setIptcData(iptcData_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if EXIV2_TEST_VERSION(0,16,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -421,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXV_PACKAGE "exiv2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void exif_init(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef EXV_ENABLE_NLS
</span></pre><pre style='margin:0'>
</pre>