<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9bc23dbf1317816fdb44327ff53c856fe4ed0984">https://github.com/macports/macports-ports/commit/9bc23dbf1317816fdb44327ff53c856fe4ed0984</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 9bc23dbf131 geeqie: update to 1.7.2
</span>9bc23dbf131 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9bc23dbf1317816fdb44327ff53c856fe4ed0984
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Mon Mar 14 09:45:44 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> geeqie: update to 1.7.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * releases on GitHub now
</span><span style='display:block; white-space:pre;color:#404040;'> * several new dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * several patches now incorporated upstream
</span><span style='display:block; white-space:pre;color:#404040;'> * refresh werror-related patch
</span><span style='display:block; white-space:pre;color:#404040;'> * add app launcher
</span><span style='display:block; white-space:pre;color:#404040;'> x plugins do not appear to work
</span>---
graphics/geeqie/Portfile | 48 ++++++++++++------
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 ---------
graphics/geeqie/files/no-Werror.patch | 4 +-
7 files changed, 36 insertions(+), 187 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 1eeeb75f390..ab9cf33f6f1 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;'>@@ -1,26 +1,30 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name geeqie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1e3ffccba08edc2739051f1252ca653f008de35b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35881152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup BestImageViewer geeqie 1.7.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8fe5d7117060cf4a9eddc9328a33bddee006d794 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 186c10fae05dd81783f5218432e777cae2e9579ce884e65afa0884c357192269 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1949240
</span>
categories graphics x11
platforms darwin
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# only used at build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict graphviz openssl11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Geeqie Image Viewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description image viewer and organiser
</span>
long_description Geeqie is a lightweight Gtk+-based image viewer for \
UNIX-like operating systems which was forked from GQView.
homepage http://www.geeqie.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_xz yes
depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,25 +36,29 @@ depends_build port:pkgconfig \
</span> depends_lib port:clutter-gtk \
port:desktop-file-utils \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:djvulibre \
</span> port:exiv2 \
port:lcms \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span> port:libchamplain \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libheif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libraw \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webp
</span>
depends_run port:adwaita-icon-theme
patchfiles-append no-Werror.patch
patchfiles-append disable-gen_changelog.sh.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# These patches are taken from the upstream repository and we should be able
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to remove them when the next version is released.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 578.patch 588.patch 605.patch 654.patch 675.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # No configure script included
configure.cmd ./autogen.sh
configure.args --disable-lirc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-jpegxl \
</span> --disable-lua \
--disable-debug-log \
--disable-doxygen-doc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +71,22 @@ configure.args --disable-lirc \
</span> --disable-doxygen-html \
--disable-doxygen-ps \
--disable-doxygen-pdf \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-ffmpegthumbnailer \
</span> --disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-archive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-djvu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-heif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-j2k \
</span> --enable-gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-map \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-webp
</span>
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Geeqie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon src/icons/svg/gqview_icon.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.hide_dock_icon yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# app.retina yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.privacy_photo "Geeqie can display photos in your photo library"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/578.patch b/graphics/geeqie/files/578.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 270977eccce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/578.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Quote path when writing orientation to file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/issues/578
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/commit/4df045ff82a832dc3d21d10833f36f12687db7f8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/layout_util.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/layout_util.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -510,8 +510,7 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rotation = g_strdup_printf("%d", fd_n->user_orientation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- keep_date ? " -t " : " ", fd_n->path, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ keep_date ? " -t \"" : " \"", fd_n->path, "\"", NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run_result = WEXITSTATUS(runcmd(command));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!run_result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e47ed16fb36..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/588.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with Apple Clang 9.0.0+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/issues/588
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/pull/589
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/commit/75c7df8b96592e10f7936dc1a28983be4089578c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/layout_util.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/layout_util.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -477,6 +477,7 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint run_result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GenericDialog *gd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GString *message;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int cmdstatus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!layout_valid(&lw)) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -511,7 +512,8 @@ static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gbo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rotation = g_strdup_printf("%d", fd_n->user_orientation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- keep_date ? " -t \"" : " \"", fd_n->path, "\"", NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run_result = WEXITSTATUS(runcmd(command));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmdstatus = runcmd(command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run_result = WEXITSTATUS(cmdstatus);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!run_result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 47f4a362b10..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/605.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix crash when writing metadata to .svg files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/issues/605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/commit/e8db929f468d1e635899253db6013ea5d35732fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -374,7 +374,7 @@ struct _ExifDataProcessed : public _ExifData
</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) throw Exiv2::Error(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;color:#808080;'>diff --git a/graphics/geeqie/files/654.patch b/graphics/geeqie/files/654.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0e7ce650478..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/654.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,91 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with exiv 0.27.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/issues/654
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/pull/655
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/commit/f9213c8ad796cf4571b2606435c32753040ec645
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,17 +22,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_EXIV2
</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;'>-+// Don't include the <exiv2/version.hpp> file directly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Early Exiv2 versions didn't have version.hpp and the macros.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <exiv2/exiv2.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</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;'>-+#ifdef EXIV2_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef EXIV2_TEST_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define EXIV2_TEST_VERSION(major,minor,patch) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXIV2_TEST_VERSION(major,minor,patch) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if EXIV2_TEST_VERSION(0,27,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,27 +48,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/mman.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !EXIV2_TEST_VERSION(0,17,90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/tiffparser.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/tiffcomposite.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/tiffvisitor.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/tiffimage.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/cr2image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/crwimage.hpp>
</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;'>--#include <exiv2/orfimage.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if EXIV2_TEST_VERSION(0,13,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/rafimage.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/futils.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/preview.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if EXIV2_TEST_VERSION(0,17,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/convert.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <exiv2/xmpsidecar.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if EXIV2_TEST_VERSION(0,27,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXV_PACKAGE "exiv2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>-@@ -374,7 +363,11 @@ struct _ExifDataProcessed : public _ExifData
</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;'>-+#ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!image) throw Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>-@@ -393,8 +386,12 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sidecar->setXmpData(xmpData_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sidecar->writeMetadata();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw Exiv2::Error(3, "xmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;color:#808080;'>diff --git a/graphics/geeqie/files/675.patch b/graphics/geeqie/files/675.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c48acd0dcf4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/675.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build against exiv2-0.27.1+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/pull/675
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/commit/c220ddefb1b6b11b54f7598f0d44dd0723325ed4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/exiv2.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/exiv2.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,7 +364,7 @@ struct _ExifDataProcessed : public _ExifData
</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;'>- #ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!image) throw Exiv2::Error(21);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -388,7 +388,7 @@ struct _ExifDataProcessed : public _ExifData
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sidecar->writeMetadata();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_EXIV2_ERROR_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerNotAnImage, "xmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw Exiv2::Error(3, "xmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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><span style='display:block; white-space:pre;color:#808080;'>index cc10fb841e5..e66160bbddd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/no-Werror.patch
</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;'>@@ -2,8 +2,8 @@ Don't use -Werror. We don't want warnings turned into errors since that can
</span> cause the build to fail. See for example:
https://github.com/BestImageViewer/geeqie/issues/684
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.orig 2017-12-31 06:31:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2019-06-23 02:25:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-12-31 06:31:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-06-23 02:25:36.000000000 -0500
</span> @@ -17,8 +17,6 @@
AC_PREREQ(2.57)
AC_INIT([geeqie], 1.4, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
</pre><pre style='margin:0'>
</pre>