gwenview: update to 19.08.3 qt5/kf5 version

8 files changed, 139 insertions, 144 deletions

diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index a0ce31e654a..d39177963d5 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,30 +1,31 @@
-# $NetBSD: Makefile,v 1.97 2019/11/02 18:39:52 maya Exp $
+# $NetBSD: Makefile,v 1.98 2019/11/17 03:21:55 markd Exp $
 
-DISTNAME=	gwenview-${_KDE_VERSION}
-PKGREVISION=	17
+DISTNAME=	gwenview-${KAPPSVER}
 CATEGORIES=	graphics
+
+HOMEPAGE=	https://kde.org/applications/graphics/org.kde.gwenview/
 COMMENT=	KDE image viewer
+LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
+
+.include "../../meta-pkgs/kde/applications.mk"
 
-# Workaround cryptic issue where cmake CMAKE_COMPILER_IS_GNUCXX is not
-# defined in this project (in FindKDE4Internal.cmake)
-BUILDLINK_TRANSFORM+=	opt:-fno-exceptions:-fexceptions
-BUILDLINK_TRANSFORM+=	opt:-DQT_NO_EXCEPTIONS:-UQT_EXCEPTIONS
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
+DEPENDS+=	kimageformats>=5.19.0:../../graphics/kimageformats
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+USE_TOOLS+=	msgmerge pkg-config
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+REPLACE_PERL=	kconf_update/gwenview-imageview-alphabackgroundmode-update.pl
 
+.include "../../devel/cfitsio/buildlink3.mk"
+.include "../../devel/kitemmodels/buildlink3.mk"
+.include "../../devel/kparts/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libkdcraw/buildlink3.mk"
 .include "../../graphics/libkipi/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-#.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libbaloo4/buildlink3.mk"
-.include "../../sysutils/kfilemetadata/buildlink3.mk"
-.include "../../x11/libkactivities4/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kde-baseapps4/buildlink3.mk"
-
+.include "../../sysutils/baloo5/buildlink3.mk"
+.include "../../x11/kactivities5/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtimageformats/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gwenview/PLIST b/graphics/gwenview/PLIST
index 0ae21f17daf..980d8d4e4c2 100644
--- a/graphics/gwenview/PLIST
+++ b/graphics/gwenview/PLIST
@@ -1,22 +1,59 @@
-@comment $NetBSD: PLIST,v 1.20 2016/01/10 19:48:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2019/11/17 03:21:55 markd Exp $
 bin/gwenview
 bin/gwenview_importer
-lib/kde4/gvpart.so
-lib/libgwenviewlib.so
-lib/libgwenviewlib.so.4
-lib/libgwenviewlib.so.${KDELIBSVER}
-share/applications/kde4/gwenview.desktop
-share/doc/kde/HTML/en/gwenview/browse_mode.png
-share/doc/kde/HTML/en/gwenview/common
-share/doc/kde/HTML/en/gwenview/fullscreen-browse.png
-share/doc/kde/HTML/en/gwenview/fullscreen-view.png
-share/doc/kde/HTML/en/gwenview/importer-picking-root-folder.png
-share/doc/kde/HTML/en/gwenview/importer.png
-share/doc/kde/HTML/en/gwenview/index.cache.bz2
-share/doc/kde/HTML/en/gwenview/index.docbook
-share/doc/kde/HTML/en/gwenview/modified-bar.png
-share/doc/kde/HTML/en/gwenview/start-page.png
-share/doc/kde/HTML/en/gwenview/view_mode.png
+lib/libgwenviewlib.so.4.97.0
+lib/libgwenviewlib.so.5
+qt5/plugins/gvpart.so
+share/applications/org.kde.gwenview.desktop
+share/doc/HTML/ca/gwenview/browse_mode.png
+share/doc/HTML/ca/gwenview/fullscreen-browse.png
+share/doc/HTML/ca/gwenview/fullscreen-view.png
+share/doc/HTML/ca/gwenview/index.cache.bz2
+share/doc/HTML/ca/gwenview/index.docbook
+share/doc/HTML/ca/gwenview/modified-bar.png
+share/doc/HTML/ca/gwenview/start-page.png
+share/doc/HTML/ca/gwenview/view_mode.png
+share/doc/HTML/de/gwenview/browse_mode.png
+share/doc/HTML/de/gwenview/fullscreen_mode.png
+share/doc/HTML/de/gwenview/index.cache.bz2
+share/doc/HTML/de/gwenview/index.docbook
+share/doc/HTML/de/gwenview/view_mode.png
+share/doc/HTML/en/gwenview/browse_mode.png
+share/doc/HTML/en/gwenview/fullscreen-browse.png
+share/doc/HTML/en/gwenview/fullscreen-view.png
+share/doc/HTML/en/gwenview/importer-picking-root-folder.png
+share/doc/HTML/en/gwenview/importer.png
+share/doc/HTML/en/gwenview/index.cache.bz2
+share/doc/HTML/en/gwenview/index.docbook
+share/doc/HTML/en/gwenview/modified-bar.png
+share/doc/HTML/en/gwenview/start-page.png
+share/doc/HTML/en/gwenview/view_mode.png
+share/doc/HTML/es/gwenview/index.cache.bz2
+share/doc/HTML/es/gwenview/index.docbook
+share/doc/HTML/it/gwenview/index.cache.bz2
+share/doc/HTML/it/gwenview/index.docbook
+share/doc/HTML/nl/gwenview/index.cache.bz2
+share/doc/HTML/nl/gwenview/index.docbook
+share/doc/HTML/pt/gwenview/index.cache.bz2
+share/doc/HTML/pt/gwenview/index.docbook
+share/doc/HTML/pt_BR/gwenview/index.cache.bz2
+share/doc/HTML/pt_BR/gwenview/index.docbook
+share/doc/HTML/sr/gwenview/index.cache.bz2
+share/doc/HTML/sr/gwenview/index.docbook
+share/doc/HTML/sv/gwenview/index.cache.bz2
+share/doc/HTML/sv/gwenview/index.docbook
+share/doc/HTML/uk/gwenview/browse_mode.png
+share/doc/HTML/uk/gwenview/fullscreen_mode.png
+share/doc/HTML/uk/gwenview/importer-picking-root-folder.png
+share/doc/HTML/uk/gwenview/importer.png
+share/doc/HTML/uk/gwenview/index.cache.bz2
+share/doc/HTML/uk/gwenview/index.docbook
+share/doc/HTML/uk/gwenview/modified-bar.png
+share/doc/HTML/uk/gwenview/start-page.png
+share/doc/HTML/uk/gwenview/view_mode.png
+share/gwenview/color-schemes/fullscreen.colors
+share/gwenview/cursors/zoom.png
+share/gwenview/images/background.png
 share/icons/hicolor/128x128/actions/document-share.png
 share/icons/hicolor/128x128/apps/gwenview.png
 share/icons/hicolor/16x16/actions/document-share.png
@@ -29,14 +66,65 @@ share/icons/hicolor/48x48/actions/document-share.png
 share/icons/hicolor/48x48/apps/gwenview.png
 share/icons/hicolor/64x64/actions/document-share.png
 share/icons/hicolor/64x64/apps/gwenview.png
-share/icons/hicolor/scalable/actions/document-share.svgz
-share/icons/hicolor/scalable/apps/gwenview.svgz
-share/kde/apps/gvpart/gvpart.rc
-share/kde/apps/gwenview/color-schemes/fullscreen.colors
-share/kde/apps/gwenview/cursors/zoom.png
-share/kde/apps/gwenview/gwenviewui.rc
-share/kde/apps/gwenview/images/background.png
-share/kde/apps/solid/actions/gwenview_importer.desktop
-share/kde/apps/solid/actions/gwenview_importer_camera.desktop
-share/kde4/services/ServiceMenus/slideshow.desktop
-share/kde4/services/gvpart.desktop
+share/kconf_update/gwenview-imageview-alphabackgroundmode-update.pl
+share/kconf_update/gwenview.upd
+share/kservices5/ServiceMenus/slideshow.desktop
+share/kservices5/gvpart.desktop
+share/kxmlgui5/gvpart/gvpart.rc
+share/locale/ar/LC_MESSAGES/gwenview.mo
+share/locale/bg/LC_MESSAGES/gwenview.mo
+share/locale/bs/LC_MESSAGES/gwenview.mo
+share/locale/ca/LC_MESSAGES/gwenview.mo
+share/locale/ca@valencia/LC_MESSAGES/gwenview.mo
+share/locale/cs/LC_MESSAGES/gwenview.mo
+share/locale/da/LC_MESSAGES/gwenview.mo
+share/locale/de/LC_MESSAGES/gwenview.mo
+share/locale/el/LC_MESSAGES/gwenview.mo
+share/locale/en_GB/LC_MESSAGES/gwenview.mo
+share/locale/eo/LC_MESSAGES/gwenview.mo
+share/locale/es/LC_MESSAGES/gwenview.mo
+share/locale/et/LC_MESSAGES/gwenview.mo
+share/locale/eu/LC_MESSAGES/gwenview.mo
+share/locale/fi/LC_MESSAGES/gwenview.mo
+share/locale/fr/LC_MESSAGES/gwenview.mo
+share/locale/ga/LC_MESSAGES/gwenview.mo
+share/locale/gl/LC_MESSAGES/gwenview.mo
+share/locale/he/LC_MESSAGES/gwenview.mo
+share/locale/hi/LC_MESSAGES/gwenview.mo
+share/locale/hr/LC_MESSAGES/gwenview.mo
+share/locale/hu/LC_MESSAGES/gwenview.mo
+share/locale/ia/LC_MESSAGES/gwenview.mo
+share/locale/id/LC_MESSAGES/gwenview.mo
+share/locale/is/LC_MESSAGES/gwenview.mo
+share/locale/it/LC_MESSAGES/gwenview.mo
+share/locale/ja/LC_MESSAGES/gwenview.mo
+share/locale/kk/LC_MESSAGES/gwenview.mo
+share/locale/km/LC_MESSAGES/gwenview.mo
+share/locale/ko/LC_MESSAGES/gwenview.mo
+share/locale/lt/LC_MESSAGES/gwenview.mo
+share/locale/lv/LC_MESSAGES/gwenview.mo
+share/locale/ml/LC_MESSAGES/gwenview.mo
+share/locale/mr/LC_MESSAGES/gwenview.mo
+share/locale/nb/LC_MESSAGES/gwenview.mo
+share/locale/nds/LC_MESSAGES/gwenview.mo
+share/locale/nl/LC_MESSAGES/gwenview.mo
+share/locale/nn/LC_MESSAGES/gwenview.mo
+share/locale/pa/LC_MESSAGES/gwenview.mo
+share/locale/pl/LC_MESSAGES/gwenview.mo
+share/locale/pt/LC_MESSAGES/gwenview.mo
+share/locale/pt_BR/LC_MESSAGES/gwenview.mo
+share/locale/ro/LC_MESSAGES/gwenview.mo
+share/locale/ru/LC_MESSAGES/gwenview.mo
+share/locale/sk/LC_MESSAGES/gwenview.mo
+share/locale/sl/LC_MESSAGES/gwenview.mo
+share/locale/sr/LC_MESSAGES/gwenview.mo
+share/locale/sv/LC_MESSAGES/gwenview.mo
+share/locale/tr/LC_MESSAGES/gwenview.mo
+share/locale/ug/LC_MESSAGES/gwenview.mo
+share/locale/uk/LC_MESSAGES/gwenview.mo
+share/locale/wa/LC_MESSAGES/gwenview.mo
+share/locale/zh_CN/LC_MESSAGES/gwenview.mo
+share/locale/zh_TW/LC_MESSAGES/gwenview.mo
+share/metainfo/org.kde.gwenview.appdata.xml
+share/solid/actions/gwenview_importer.desktop
+share/solid/actions/gwenview_importer_camera.desktop
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index bc5a56642d2..a80e575b382 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.30 2019/11/02 18:39:52 maya Exp $
+$NetBSD: distinfo,v 1.31 2019/11/17 03:21:55 markd Exp $
 
-SHA1 (gwenview-4.14.3.tar.xz) = dfa98856fbcd7e51050f23716d7f24dab264bf12
-RMD160 (gwenview-4.14.3.tar.xz) = 493754167864154be07772bc85be168fb5a2b755
-SHA512 (gwenview-4.14.3.tar.xz) = cb64b2278adb01f0fad92d861126ff8256c80ae8780de0a37bcc1e6a0e19e2f5b14c09fc884c6d759a0cd6b3a2611787235020745147c9fc66883d61ab4861c3
-Size (gwenview-4.14.3.tar.xz) = 2910652 bytes
-SHA1 (patch-CMakeLists.txt) = b0a28c3b1504dc1cb7ab1403cc89518bf2d14022
-SHA1 (patch-lib_exiv2imageloader.cpp) = fdcec8772c464561fee30a79fb1d41e141638cab
-SHA1 (patch-lib_imagemetainfomodel.cpp) = cbccab9c83c4998ade81ba1dc44226b5d84f4a30
-SHA1 (patch-lib_jpegcontent.cpp) = f2701a9c41e97012607cc9c43969f018b040f425
-SHA1 (patch-lib_timeutils.cpp) = a0ed38eaffd907f19a53abbb79ab182a8dbe623a
+SHA1 (gwenview-19.08.3.tar.xz) = afe8633480b5772f491243dba66c28b33ab86d39
+RMD160 (gwenview-19.08.3.tar.xz) = c33e70e45decbe632efdcd77fa7d1fce6e3c00c2
+SHA512 (gwenview-19.08.3.tar.xz) = 5db117a5975ee09b8b40fa420cc129fc6cb786a19d67dd391f12a560049134328977f3ed1dbf3f6ba379d46d0d8c00fb2290dda84fb44e90055037818cce84bf
+Size (gwenview-19.08.3.tar.xz) = 5723104 bytes
diff --git a/graphics/gwenview/patches/patch-CMakeLists.txt b/graphics/gwenview/patches/patch-CMakeLists.txt
deleted file mode 100644
index b3ff0e7da1e..00000000000
--- a/graphics/gwenview/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/02 18:39:52 maya Exp $
-
-kdelibs4's FindExiv2.cmake is wrong about new exiv2.
-Workaround using pkgconfig.
-
---- CMakeLists.txt.orig	2014-09-30 09:11:42.000000000 +0000
-+++ CMakeLists.txt
-@@ -3,6 +3,7 @@ project(gwenview)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
- 
- find_package(KDE4 4.6.41 REQUIRED)
-+find_package(PkgConfig)
- include(KDE4Defaults)
- include(MacroLibrary)
- include(MacroOptionalAddSubdirectory)
-@@ -32,7 +33,7 @@ macro_log_feature(JPEG_FOUND "libjpeg" "
- find_package(PNG)
- macro_log_feature(PNG_FOUND "libpng" "PNG image manipulation support" "http://www.libpng.org" TRUE)
- 
--find_package(Exiv2)
-+pkg_check_modules(EXIV2 exiv2>=0.19)
- macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata support" "http://www.exiv2.org" TRUE "0.19")
- 
- macro_optional_find_package(Kipi)
diff --git a/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp b/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp
deleted file mode 100644
index bf8d021dd7d..00000000000
--- a/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_exiv2imageloader.cpp,v 1.1 2019/11/02 18:39:52 maya Exp $
-
-exiv2 0.27.0 fixes
-
---- lib/exiv2imageloader.cpp.orig	2014-09-30 09:11:42.000000000 +0000
-+++ lib/exiv2imageloader.cpp
-@@ -28,8 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- // KDE
- 
- // Exiv2
--#include <exiv2/error.hpp>
--#include <exiv2/types.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // Local
- 
diff --git a/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp b/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp
deleted file mode 100644
index 026451c50e6..00000000000
--- a/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib_imagemetainfomodel.cpp,v 1.1 2019/11/02 18:39:52 maya Exp $
-
-Newer exiv2 fixes. (0.27.0)
-
---- lib/imagemetainfomodel.cpp.orig	2014-09-30 09:11:42.000000000 +0000
-+++ lib/imagemetainfomodel.cpp
-@@ -30,9 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include <KLocale>
- 
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // Local
- 
diff --git a/graphics/gwenview/patches/patch-lib_jpegcontent.cpp b/graphics/gwenview/patches/patch-lib_jpegcontent.cpp
deleted file mode 100644
index 114fd0612fd..00000000000
--- a/graphics/gwenview/patches/patch-lib_jpegcontent.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_jpegcontent.cpp,v 1.1 2019/11/02 18:39:52 maya Exp $
-
-exiv2 0.27.0 fixes
-
---- lib/jpegcontent.cpp.orig	2014-09-30 09:11:42.000000000 +0000
-+++ lib/jpegcontent.cpp
-@@ -42,8 +42,7 @@ extern "C" {
- #include <KLocale>
- 
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // Local
- #include "jpegerrormanager.h"
diff --git a/graphics/gwenview/patches/patch-lib_timeutils.cpp b/graphics/gwenview/patches/patch-lib_timeutils.cpp
deleted file mode 100644
index 5acf0a09905..00000000000
--- a/graphics/gwenview/patches/patch-lib_timeutils.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_timeutils.cpp,v 1.1 2019/11/02 18:39:52 maya Exp $
-
-exiv2 0.27.0 fixes
-
---- lib/timeutils.cpp.orig	2014-09-30 09:11:42.000000000 +0000
-+++ lib/timeutils.cpp
-@@ -30,8 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include <KFileItem>
- 
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // Local
- #include <lib/exiv2imageloader.h>