<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/dcbf39e2d920efc9b32f3718635f74286a26cf7f">https://github.com/macports/macports-ports/commit/dcbf39e2d920efc9b32f3718635f74286a26cf7f</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 dcbf39e libkexiv2: fix build against exiv2 0.27
</span>dcbf39e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dcbf39e2d920efc9b32f3718635f74286a26cf7f
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Mon Dec 24 08:17:41 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> libkexiv2: fix build against exiv2 0.27
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> kdelibs4: fix cmake module for exiv2
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57803
</span>---
kde/kdelibs4/Portfile | 6 ++++--
kde/kdelibs4/files/patch-FindExiv2.diff | 11 +++++++++++
kde/libkexiv2/Portfile | 8 ++++++--
kde/libkexiv2/files/patch-libkexiv2-kexiv2_p.h.diff | 10 ++++++++++
kde/libkexiv2/files/patch-libkexiv2-kexiv2exif.cpp.diff | 11 +++++++++++
5 files changed, 42 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 717e76f..d1686d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kdelibs4
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 13
</span> categories kde kde4
maintainers {nicos @NicosPavlov}
license LGPL-2+ GPL-2+ BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,9 @@ patchfiles workaround-kdeinit4-crash.patch \
</span> patch-removeFindFlex.diff \
patch-cmake-modules-FindKDE4-Internal.cmake.diff \
patch-KdePreferences.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ui-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ui-CMakeLists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-FindExiv2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #Deactivated as of ticket #45373
# patch-nativeDialogs.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/files/patch-FindExiv2.diff b/kde/kdelibs4/files/patch-FindExiv2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a69ad3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/files/patch-FindExiv2.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;'>+--- a/cmake/modules/FindExiv2.cmake.orig 2014-11-07 07:33:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/modules/FindExiv2.cmake 2018-12-24 15:47:52.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get the version number from exiv2/version.hpp and store it in the cache:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkexiv2/Portfile b/kde/libkexiv2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef3c036..b369b84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/libkexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +18,10 @@ homepage https://www.kde.org
</span> master_sites kde:stable/${version}/src/
use_xz yes
distname libkexiv2-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 67b9a51cd4694bcda0d5490d8e161504448d65c8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c487078cc7349768dc76f0eabd98e546762fdd3fda9da088fbfa74785daf0efd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c487078cc7349768dc76f0eabd98e546762fdd3fda9da088fbfa74785daf0efd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 136292
</span>
#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +29,9 @@ license_noconflict openssl
</span> depends_lib-append port:kdelibs4 \
port:exiv2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libkexiv2-rotationmatrix.cpp.orig.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libkexiv2-kexiv2_p.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libkexiv2-kexiv2exif.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libkexiv2-rotationmatrix.cpp.orig.diff
</span>
livecheck.url ${kde4.mirror}
livecheck.regex (\\d+(\\.\\d+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkexiv2/files/patch-libkexiv2-kexiv2_p.h.diff b/kde/libkexiv2/files/patch-libkexiv2-kexiv2_p.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a9c986
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkexiv2/files/patch-libkexiv2-kexiv2_p.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libkexiv2/kexiv2_p.h.orig 2018-12-24 08:09:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libkexiv2/kexiv2_p.h 2018-12-24 08:10:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,6 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <exiv2/types.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;'>+ #include <exiv2/xmpsidecar.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <exiv2/version.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check if Exiv2 support XMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkexiv2/files/patch-libkexiv2-kexiv2exif.cpp.diff b/kde/libkexiv2/files/patch-libkexiv2-kexiv2exif.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..97f6789
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkexiv2/files/patch-libkexiv2-kexiv2exif.cpp.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;'>+--- libkexiv2/kexiv2exif.cpp.orig 2014-10-06 23:07:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libkexiv2/kexiv2exif.cpp 2018-12-24 08:06:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -986,7 +986,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
</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;background:#e0ffe0;'>+ // Remove sub-IFD tags
</span></pre><pre style='margin:0'>
</pre>