CVS commit: pkgsrc/devel/kio-extras

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jul  8 21:28:32 UTC 2021

Modified Files:
        pkgsrc/devel/kio-extras: Makefile distinfo
Added Files:
        pkgsrc/devel/kio-extras/patches: patch-thumbnail_CMakeLists.txt
            patch-thumbnail_exrcreator.cpp

Log Message:
kio-extras: build with openexr3


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/kio-extras/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/kio-extras/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kio-extras/patches/patch-thumbnail_CMakeLists.txt \
    pkgsrc/devel/kio-extras/patches/patch-thumbnail_exrcreator.cpp

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

Modified files:

Index: pkgsrc/devel/kio-extras/Makefile
diff -u pkgsrc/devel/kio-extras/Makefile:1.6 pkgsrc/devel/kio-extras/Makefile:1.7
--- pkgsrc/devel/kio-extras/Makefile:1.6        Mon May 24 19:49:59 2021
+++ pkgsrc/devel/kio-extras/Makefile    Thu Jul  8 21:28:32 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/05/24 19:49:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/07/08 21:28:32 markd Exp $
 
 DISTNAME=      kio-extras-${KAPPSVER}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    misc
 
 HOMEPAGE=      https://kde.org/applications/internet/

Index: pkgsrc/devel/kio-extras/distinfo
diff -u pkgsrc/devel/kio-extras/distinfo:1.2 pkgsrc/devel/kio-extras/distinfo:1.3
--- pkgsrc/devel/kio-extras/distinfo:1.2        Mon Apr  5 06:53:13 2021
+++ pkgsrc/devel/kio-extras/distinfo    Thu Jul  8 21:28:32 2021
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2021/04/05 06:53:13 markd Exp $
+$NetBSD: distinfo,v 1.3 2021/07/08 21:28:32 markd Exp $
 
 SHA1 (kio-extras-20.12.3.tar.xz) = bf36af39998208b43b680070ad46872d33c879a5
 RMD160 (kio-extras-20.12.3.tar.xz) = 7dee21ac69081a924eb902a58c2984d2c3db3853
 SHA512 (kio-extras-20.12.3.tar.xz) = a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
 Size (kio-extras-20.12.3.tar.xz) = 636012 bytes
 SHA1 (patch-info_kde-info2html.conf) = cad6874771fc5862b2bde6e3f2d49f9dcaf48924
+SHA1 (patch-thumbnail_CMakeLists.txt) = fe481415b8ba599eceb697725694e00701e43f48
+SHA1 (patch-thumbnail_exrcreator.cpp) = 4ce17e0af20d554f7570d0ef94d4946f39f05b78

Added files:

Index: pkgsrc/devel/kio-extras/patches/patch-thumbnail_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/kio-extras/patches/patch-thumbnail_CMakeLists.txt:1.1
--- /dev/null   Thu Jul  8 21:28:32 2021
+++ pkgsrc/devel/kio-extras/patches/patch-thumbnail_CMakeLists.txt      Thu Jul  8 21:28:32 2021
@@ -0,0 +1,33 @@
+$NetBSD: patch-thumbnail_CMakeLists.txt,v 1.1 2021/07/08 21:28:32 markd Exp $
+
+openexr3
+
+--- thumbnail/CMakeLists.txt.orig      2021-02-24 23:05:55.000000000 +0000
++++ thumbnail/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_thumbnail\")
+ 
+-find_package(OpenEXR)
++find_package(OpenEXR 3.0 CONFIG)
++if(NOT OpenEXR_FOUND)
++    find_package(OpenEXR)
++endif()
+ set_package_properties(OpenEXR PROPERTIES DESCRIPTION "API for accessing OpenEXR formatted images"
+                        URL "https://www.openexr.com";
+                        TYPE OPTIONAL
+@@ -144,9 +147,13 @@ if(OpenEXR_FOUND)
+     target_link_libraries(exrthumbnail
+             KF5::KIOCore
+             KF5::KIOWidgets
+-            ${OpenEXR_LIBRARIES}
+     )
+-    target_include_directories(exrthumbnail SYSTEM PRIVATE ${OpenEXR_INCLUDE_DIRS})
++    if(TARGET OpenEXR::OpenEXR)
++        target_link_libraries(exrthumbnail OpenEXR::OpenEXR)
++    else()
++        target_include_directories(exrthumbnail SYSTEM PRIVATE ${OpenEXR_INCLUDE_DIRS})
++        target_link_libraries(exrthumbnail OpenEXR::OpenEXR)
++    endif()
+ 
+     # OpenEXR headers use exceptions; at least clang refuses to build the target
+     # when exceptions are not enabled.
Index: pkgsrc/devel/kio-extras/patches/patch-thumbnail_exrcreator.cpp
diff -u /dev/null pkgsrc/devel/kio-extras/patches/patch-thumbnail_exrcreator.cpp:1.1
--- /dev/null   Thu Jul  8 21:28:32 2021
+++ pkgsrc/devel/kio-extras/patches/patch-thumbnail_exrcreator.cpp      Thu Jul  8 21:28:32 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-thumbnail_exrcreator.cpp,v 1.1 2021/07/08 21:28:32 markd Exp $
+
+openexr3
+
+--- thumbnail/exrcreator.cpp.orig      2021-02-24 23:05:55.000000000 +0000
++++ thumbnail/exrcreator.cpp
+@@ -23,6 +23,7 @@
+ #include <QImage>
+ #include <QFile>
+ 
++#include <ImfHeader.h>
+ #include <ImfInputFile.h>
+ #include <ImfPreviewImage.h>
+