CVS commit: pkgsrc/graphics/gwenview

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Nov  2 18:39:52 UTC 2019

Modified Files:
        pkgsrc/graphics/gwenview: Makefile distinfo
Added Files:
        pkgsrc/graphics/gwenview/patches: patch-CMakeLists.txt
            patch-lib_exiv2imageloader.cpp patch-lib_imagemetainfomodel.cpp
            patch-lib_jpegcontent.cpp patch-lib_timeutils.cpp

Log Message:
gwenview: fix build with newer exiv2. workaround cryptic cmake issue.

Bypass FindExiv2.cmake with pkgconfig. Use the big exiv2 header instead
of two headers that are no longer sufficient.

For some reason the test CMAKE_COMPILER_IS_GNUCXX doesn't pass, so
we don't know how to enable/disable exceptions. Use BUILDLINK_TRANSFORM
for this.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/graphics/gwenview/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/gwenview/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt \
    pkgsrc/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp \
    pkgsrc/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp \
    pkgsrc/graphics/gwenview/patches/patch-lib_jpegcontent.cpp \
    pkgsrc/graphics/gwenview/patches/patch-lib_timeutils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gwenview/Makefile
diff -u pkgsrc/graphics/gwenview/Makefile:1.96 pkgsrc/graphics/gwenview/Makefile:1.97
--- pkgsrc/graphics/gwenview/Makefile:1.96      Thu Aug 22 12:23:18 2019
+++ pkgsrc/graphics/gwenview/Makefile   Sat Nov  2 18:39:52 2019
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.96 2019/08/22 12:23:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.97 2019/11/02 18:39:52 maya Exp $
 
 DISTNAME=      gwenview-${_KDE_VERSION}
 PKGREVISION=   17
 CATEGORIES=    graphics
 COMMENT=       KDE image viewer
 
+# 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
+
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
 .include "../../meta-pkgs/kde4/kde4.mk"

Index: pkgsrc/graphics/gwenview/distinfo
diff -u pkgsrc/graphics/gwenview/distinfo:1.29 pkgsrc/graphics/gwenview/distinfo:1.30
--- pkgsrc/graphics/gwenview/distinfo:1.29      Tue Nov  3 21:34:03 2015
+++ pkgsrc/graphics/gwenview/distinfo   Sat Nov  2 18:39:52 2019
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.29 2015/11/03 21:34:03 agc Exp $
+$NetBSD: distinfo,v 1.30 2019/11/02 18:39:52 maya 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

Added files:

Index: pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Nov  2 18:39:52 2019
+++ pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt       Sat Nov  2 18:39:52 2019
@@ -0,0 +1,24 @@
+$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)
Index: pkgsrc/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp:1.1
--- /dev/null   Sat Nov  2 18:39:52 2019
+++ pkgsrc/graphics/gwenview/patches/patch-lib_exiv2imageloader.cpp     Sat Nov  2 18:39:52 2019
@@ -0,0 +1,16 @@
+$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
+ 
Index: pkgsrc/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp:1.1
--- /dev/null   Sat Nov  2 18:39:52 2019
+++ pkgsrc/graphics/gwenview/patches/patch-lib_imagemetainfomodel.cpp   Sat Nov  2 18:39:52 2019
@@ -0,0 +1,17 @@
+$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
+ 
Index: pkgsrc/graphics/gwenview/patches/patch-lib_jpegcontent.cpp
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-lib_jpegcontent.cpp:1.1
--- /dev/null   Sat Nov  2 18:39:52 2019
+++ pkgsrc/graphics/gwenview/patches/patch-lib_jpegcontent.cpp  Sat Nov  2 18:39:52 2019
@@ -0,0 +1,16 @@
+$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"
Index: pkgsrc/graphics/gwenview/patches/patch-lib_timeutils.cpp
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-lib_timeutils.cpp:1.1
--- /dev/null   Sat Nov  2 18:39:52 2019
+++ pkgsrc/graphics/gwenview/patches/patch-lib_timeutils.cpp    Sat Nov  2 18:39:52 2019
@@ -0,0 +1,16 @@
+$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>