libkexiv2: update to 19.08.3 qt5/kf5 version

7 files changed, 35 insertions, 113 deletions

diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index f6e09f49431..d40406fe25b 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.74 2019/11/02 22:37:59 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.75 2019/11/17 02:36:54 markd Exp $
 
-DISTNAME=	libkexiv2-15.08.3
-PKGREVISION=	13
+DISTNAME=	libkexiv2-${KAPPSVER}
 CATEGORIES=	graphics
-COMMENT=	KDE wrapper around exiv2
-MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.08.3/src/}
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+HOMEPAGE=	https://kde.org/applications/graphics/
+COMMENT=	KDE wrapper around exiv2
+LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
 
-PKGCONFIG_OVERRIDE+=	libkexiv2.pc.cmake
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+USE_TOOLS+=	pkg-config
 
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkexiv2/PLIST b/graphics/libkexiv2/PLIST
index 559c67b4549..ef95baf3152 100644
--- a/graphics/libkexiv2/PLIST
+++ b/graphics/libkexiv2/PLIST
@@ -1,20 +1,18 @@
-@comment $NetBSD: PLIST,v 1.7 2016/01/10 19:43:10 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
+@comment $NetBSD: PLIST,v 1.8 2019/11/17 02:36:54 markd Exp $
+include/KF5/KExiv2/KExiv2/KExiv2
+include/KF5/KExiv2/KExiv2/KExiv2Data
+include/KF5/KExiv2/KExiv2/KExiv2Previews
+include/KF5/KExiv2/KExiv2/RotationMatrix
+include/KF5/KExiv2/kexiv2/kexiv2.h
+include/KF5/KExiv2/kexiv2/kexiv2data.h
+include/KF5/KExiv2/kexiv2/kexiv2previews.h
+include/KF5/KExiv2/kexiv2/libkexiv2_export.h
+include/KF5/KExiv2/kexiv2/rotationmatrix.h
+include/KF5/libkexiv2_version.h
+lib/cmake/KF5KExiv2/KF5KExiv2Config.cmake
+lib/cmake/KF5KExiv2/KF5KExiv2ConfigVersion.cmake
+lib/cmake/KF5KExiv2/KF5KExiv2Targets-noconfig.cmake
+lib/cmake/KF5KExiv2/KF5KExiv2Targets.cmake
+lib/libKF5KExiv2.so
+lib/libKF5KExiv2.so.15.0.0
+lib/libKF5KExiv2.so.5.0.0
diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk
index b219882fd72..75700053d03 100644
--- a/graphics/libkexiv2/buildlink3.mk
+++ b/graphics/libkexiv2/buildlink3.mk
@@ -1,13 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:15 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2019/11/17 02:36:54 markd Exp $
 
 BUILDLINK_TREE+=	libkexiv2
 
 .if !defined(LIBKEXIV2_BUILDLINK3_MK)
 LIBKEXIV2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkexiv2+=	libkexiv2>=4.8.0
-BUILDLINK_PKGSRCDIR.libkexiv2?=		../../graphics/libkexiv2
+BUILDLINK_API_DEPENDS.libkexiv2+=	libkexiv2>=17.12.1
+BUILDLINK_PKGSRCDIR.libkexiv2?=		../../wip/libkexiv2
 
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# LIBKEXIV2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libkexiv2
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index e35b8b17462..f88009f4806 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.20 2019/11/02 13:51:12 maya Exp $
+$NetBSD: distinfo,v 1.21 2019/11/17 02:36:54 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
+SHA1 (libkexiv2-19.08.3.tar.xz) = b93562ab85c93a75c5afb6d9b585bd22c2e91398
+RMD160 (libkexiv2-19.08.3.tar.xz) = ec869f639e43d2efdbc630fc91a8822f4f749f16
+SHA512 (libkexiv2-19.08.3.tar.xz) = 4cdd654de9e658fd145b6004e94c8cbdb39de3787466ef02500cac3f858cf5eda2c0ebee9ad2f4fe129273fecbb61b3c0bf49cddc98209cbe555a63fe8c05549
+Size (libkexiv2-19.08.3.tar.xz) = 64520 bytes
diff --git a/graphics/libkexiv2/patches/patch-CMakeLists.txt b/graphics/libkexiv2/patches/patch-CMakeLists.txt
deleted file mode 100644
index 20db1c332c8..00000000000
--- a/graphics/libkexiv2/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/02 13:51:12 maya 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 --git a/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2__p.h b/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2__p.h
deleted file mode 100644
index 1514e391957..00000000000
--- a/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2__p.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-libkexiv2_kexiv2__p.h,v 1.1 2019/11/02 13:51:12 maya 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 --git a/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2exif.cpp b/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2exif.cpp
deleted file mode 100644
index e2c48cacc89..00000000000
--- a/graphics/libkexiv2/patches/patch-libkexiv2_kexiv2exif.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-libkexiv2_kexiv2exif.cpp,v 1.1 2019/11/02 13:51:12 maya 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