[pkgsrc/trunk]: pkgsrc/graphics/libkexiv2-kde4 libkexiv2-kde4: readd libkexiv...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/308ad34878d3
branches:  trunk
changeset: 404692:308ad34878d3
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Nov 17 02:15:38 2019 +0000

description:
libkexiv2-kde4: readd libkexiv2 as libkexiv2-kde4

diffstat:

 graphics/libkexiv2-kde4/DESCR                                  |   6 ++
 graphics/libkexiv2-kde4/Makefile                               |  19 +++++++
 graphics/libkexiv2-kde4/PLIST                                  |  20 +++++++
 graphics/libkexiv2-kde4/buildlink3.mk                          |  13 +++++
 graphics/libkexiv2-kde4/distinfo                               |   9 +++
 graphics/libkexiv2-kde4/patches/patch-CMakeLists.txt           |  25 +++++++++
 graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2__p.h    |  26 ++++++++++
 graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2exif.cpp |  20 +++++++
 8 files changed, 138 insertions(+), 0 deletions(-)

diffs (170 lines):

diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/DESCR     Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,6 @@
+libKExiv2 is a wrapper around exiv2, providing read/write access to EXIF,
+IPTC and XMP metadata. The main differences to exiv2 are:
+
+* Functions take standard Qt containers as parameters
+* Helper functions for GPS data
+* Transparent XMP sidecar support
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/Makefile  Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/11/17 02:15:38 markd Exp $
+#
+
+DISTNAME=      libkexiv2-15.08.3
+PKGNAME=       libkexiv2-kde4-15.08.3
+CATEGORIES=    graphics
+COMMENT=       KDE wrapper around exiv2
+MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.3/src/}
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+PKGCONFIG_OVERRIDE+=   libkexiv2.pc.cmake
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../graphics/exiv2/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/PLIST     Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1 2019/11/17 02:15:38 markd Exp $
+include/libkexiv2/altlangstredit.h
+include/libkexiv2/countryselector.h
+include/libkexiv2/kexiv2.h
+include/libkexiv2/kexiv2data.h
+include/libkexiv2/kexiv2previews.h
+include/libkexiv2/libkexiv2_export.h
+include/libkexiv2/msgtextedit.h
+include/libkexiv2/rotationmatrix.h
+include/libkexiv2/subjectwidget.h
+include/libkexiv2/version.h
+lib/cmake/libkexiv2-2.4.0/libkexiv2-config-version.cmake
+lib/cmake/libkexiv2-2.4.0/libkexiv2-config.cmake
+lib/cmake/libkexiv2-2.4.0/libkexiv2-export-relwithdebinfo.cmake
+lib/cmake/libkexiv2-2.4.0/libkexiv2-export.cmake
+lib/libkexiv2.so
+lib/libkexiv2.so.11
+lib/libkexiv2.so.11.3.0
+lib/pkgconfig/libkexiv2.pc
+share/kde/apps/libkexiv2/data/topicset.iptc-subjectcode.xml
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/buildlink3.mk     Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/11/17 02:15:38 markd Exp $
+
+BUILDLINK_TREE+=       libkexiv2-kde4
+
+.if !defined(LIBKEXIV2_KDE4_BUILDLINK3_MK)
+LIBKEXIV2_KDE4_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libkexiv2-kde4+= libkexiv2-kde4>=4.8.0
+BUILDLINK_PKGSRCDIR.libkexiv2-kde4?=           ../../graphics/libkexiv2-kde4
+
+.endif # LIBKEXIV2_KDE4_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -libkexiv2-kde4
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/distinfo  Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2019/11/17 02:15:38 markd Exp $
+
+SHA1 (libkexiv2-15.08.3.tar.xz) = 09adf7887dc644431a6930ba645162707c16bb3d
+RMD160 (libkexiv2-15.08.3.tar.xz) = 190de195363cd668336efa8a0f1995d7f658a6c0
+SHA512 (libkexiv2-15.08.3.tar.xz) = f20463dc7d54404c933fb30d55702111aaa1238a521de066c18e91d54f8fe8cb56c51ff4b76100f7508c5b42e24895b864d7ce5b2032652154844f7522c1c1ad
+Size (libkexiv2-15.08.3.tar.xz) = 137376 bytes
+SHA1 (patch-CMakeLists.txt) = 321dcdb78b0c2cfbeb3b7237aa3a3cb7c8425a01
+SHA1 (patch-libkexiv2_kexiv2__p.h) = d906d1f970710ee99c290bcc9ecd06336ab7e116
+SHA1 (patch-libkexiv2_kexiv2exif.cpp) = b9a198f0c6a02f40bc8e962e9429ebf4f2772765
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/patches/patch-CMakeLists.txt      Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/17 02:15:39 markd Exp $
+
+Workaround kdelibs4's FindExiv2.cmake not matching for newer exiv2.
+Use pkgconfig instead.
+
+--- CMakeLists.txt.orig        2015-04-30 19:04:22.000000000 +0000
++++ CMakeLists.txt
+@@ -10,6 +10,7 @@ message(STATUS "------------------------
+ message(STATUS "Starting CMake configuration for: libkexiv2")
+ 
+ find_package(KDE4 REQUIRED)
++find_package(PkgConfig)
+ 
+ include(KDE4Defaults)
+ include(MacroLibrary)
+@@ -23,8 +24,7 @@ include_directories(${QDBUS_INCLUDE_DIRS
+ set(LIBKEXIV2_AREA_CODE_GENERAL 51003)
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=${LIBKEXIV2_AREA_CODE_GENERAL})
+ 
+-set(EXIV2_MIN_VERSION "0.24")
+-find_package(Exiv2)
++pkg_check_modules(EXIV2 exiv2>=0.25)
+ MACRO_LOG_FEATURE(EXIV2_FOUND "Exiv2" "Required to build libkexiv2." "http://www.exiv2.org";
+                   TRUE ${EXIV2_MIN_VERSION} "")
+ 
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2__p.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2__p.h       Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-libkexiv2_kexiv2__p.h,v 1.1 2019/11/17 02:15:39 markd Exp $
+
+New exiv2 support.
+from https://github.com/KDE/libkexiv2/commit/d1be9298c7f2b9c717cda154d41732f230ea13a6
+
+--- libkexiv2/kexiv2_p.h.orig  2015-04-30 19:04:22.000000000 +0000
++++ libkexiv2/kexiv2_p.h
+@@ -74,17 +74,7 @@
+ #pragma GCC visibility push(default)
+ #endif
+ 
+-#include <exiv2/exv_conf.h>
+-#include <exiv2/error.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/jpgimage.hpp>
+-#include <exiv2/datasets.hpp>
+-#include <exiv2/tags.hpp>
+-#include <exiv2/preview.hpp>
+-#include <exiv2/properties.hpp>
+-#include <exiv2/types.hpp>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Check if Exiv2 support XMP
+ 
diff -r ffd8a8c447d5 -r 308ad34878d3 graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2exif.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libkexiv2-kde4/patches/patch-libkexiv2_kexiv2exif.cpp    Sun Nov 17 02:15:38 2019 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-libkexiv2_kexiv2exif.cpp,v 1.1 2019/11/17 02:15:39 markd Exp $
+
+New exiv2 support.
+From https://github.com/KDE/libkexiv2/commit/d1be9298c7f2b9c717cda154d41732f230ea13a6
+
+--- libkexiv2/kexiv2exif.cpp.orig      2015-04-30 19:04:22.000000000 +0000
++++ libkexiv2/kexiv2exif.cpp
+@@ -986,7 +986,12 @@ bool KExiv2::setTiffThumbnail(const QIma
+ 
+         if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
+         {
++
++#if EXIV2_TEST_VERSION(0,27,0)
++            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
++#else
+             throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
++#endif
+         }
+ 
+         // Remove sub-IFD tags