<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf408e1911b76d2ad80f811613c8e83c7dc5d084">https://github.com/macports/macports-ports/commit/cf408e1911b76d2ad80f811613c8e83c7dc5d084</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf408e1911b76d2ad80f811613c8e83c7dc5d084
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sun Dec 23 21:14:30 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> gthumb: fix build against exiv2 0.27
</span>---
gnome/gthumb/Portfile | 5 +++
...tch-extensions-exiv2_tools-exiv2-utils.cpp.diff | 50 ++++++++++++++++++++++
...ns-gstreamer_tools-gth-media-viewer-page.c.diff | 11 +++++
3 files changed, 66 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/Portfile b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bede36..0bca1dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,8 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:yelp
patchfiles patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-extensions-exiv2_tools-exiv2-utils.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-extensions-gstreamer_tools-gth-media-viewer-page.c.diff \
</span> patch-gthumb-gth-toolbox.c.diff \
patch-no-bitmaps-with-invalid-colors.diff \
patch-fix-selections-action-name.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +54,7 @@ patchfiles patch-configure.ac.diff \
</span> patch-fix-seqfault-when-svg-cannot-be-loaded.diff \
patch-use-autoaudiosink.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +71,8 @@ configure.args --enable-libraw \
</span> --disable-schemas-compile \
--disable-silent-rules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env GTK_LIBS=-I${prefix}/include/gtk-3.0/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> universal_variant no
variant clutter description {Enable use of clutter in slide show feature} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-extensions-exiv2_tools-exiv2-utils.cpp.diff b/gnome/gthumb/files/patch-extensions-exiv2_tools-exiv2-utils.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..eebf067
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-extensions-exiv2_tools-exiv2-utils.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/exiv2_tools/exiv2-utils.cpp.orig 2015-12-23 07:14:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/exiv2_tools/exiv2-utils.cpp 2018-12-22 14:46:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iomanip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <exiv2/xmp.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <exiv2/xmp_exiv2.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gthumb.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "exiv2-utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -720,11 +720,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_exif_default_category (const Exiv2::Exifdatum &md)
</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, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#if EXIV2_TEST_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
</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;'>+ return "Exif::MakerNotes";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (md.groupName().compare("Thumbnail") == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -755,11 +755,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stringstream description;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! md->tagLabel().empty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description << md->tagLabel();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if EXIV2_TEST_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#if EXIV2_TEST_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
</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;'>+ // Must be a MakerNote - include group name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description << md->groupName() << "." << md->tagName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1073,7 +1073,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (exifData.empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- throw Exiv2::Error(1, " No Exif data found in the file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::ExifData::const_iterator end = exifData.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-extensions-gstreamer_tools-gth-media-viewer-page.c.diff b/gnome/gthumb/files/patch-extensions-gstreamer_tools-gth-media-viewer-page.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6f9c645
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-extensions-gstreamer_tools-gth-media-viewer-page.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/gstreamer_tools/gth-media-viewer-page.c.orig 2015-12-23 07:46:18.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/gstreamer_tools/gth-media-viewer-page.c 2018-12-23 18:58:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gdk/gdkkeysyms.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <gdk/gdkx.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#include <gdk/gdkx.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gst/gst.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gst/video/videooverlay.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gthumb.h>
</span></pre><pre style='margin:0'>
</pre>