CVS commit: pkgsrc/graphics/gwenview

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Aug 24 04:30:18 UTC 2024

Modified Files:
        pkgsrc/graphics/gwenview: Makefile distinfo
Added Files:
        pkgsrc/graphics/gwenview/patches: patch-CMakeLists.txt
            patch-app_CMakeLists.txt patch-lib_CMakeLists.txt

Log Message:
gwenview: fix build with kimageannotator 0.7.1


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/graphics/gwenview/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/gwenview/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gwenview/patches/patch-app_CMakeLists.txt
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/graphics/gwenview/patches/patch-lib_CMakeLists.txt

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.143 pkgsrc/graphics/gwenview/Makefile:1.144
--- pkgsrc/graphics/gwenview/Makefile:1.143     Fri Aug  9 09:42:19 2024
+++ pkgsrc/graphics/gwenview/Makefile   Sat Aug 24 04:30:18 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.143 2024/08/09 09:42:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.144 2024/08/24 04:30:18 markd Exp $
 
 DISTNAME=      gwenview-${KAPPSVER}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    graphics
 
 HOMEPAGE=      https://kde.org/applications/graphics/org.kde.gwenview/

Index: pkgsrc/graphics/gwenview/distinfo
diff -u pkgsrc/graphics/gwenview/distinfo:1.40 pkgsrc/graphics/gwenview/distinfo:1.41
--- pkgsrc/graphics/gwenview/distinfo:1.40      Tue Feb  6 11:05:22 2024
+++ pkgsrc/graphics/gwenview/distinfo   Sat Aug 24 04:30:18 2024
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.40 2024/02/06 11:05:22 markd Exp $
+$NetBSD: distinfo,v 1.41 2024/08/24 04:30:18 markd Exp $
 
 BLAKE2s (gwenview-23.08.4.tar.xz) = 5598e668bbb67c1ec8abef4d25062d49a0158033d27edc80d4783c244b48fc63
 SHA512 (gwenview-23.08.4.tar.xz) = 60d2509ccc4c85cce206fbd4755a6b9a0ec6ab7ba094361705de972dc8a30f4ab2be3c7a163bd8113758efd93b3fef0feb98dc16b00e92ce4646ccd47db0b943
 Size (gwenview-23.08.4.tar.xz) = 6903120 bytes
+SHA1 (patch-CMakeLists.txt) = 3bc69611af88cab88b27439f6c57c634cf96adbb
+SHA1 (patch-app_CMakeLists.txt) = f6ef0755f4ec81a2e56c7efa9991b17581a3c60c
+SHA1 (patch-lib_CMakeLists.txt) = 0ed6963056d6e4137bd0cff76fea113124d45fe8

Added files:

Index: pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Sat Aug 24 04:30:18 2024
+++ pkgsrc/graphics/gwenview/patches/patch-CMakeLists.txt       Sat Aug 24 04:30:18 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2024/08/24 04:30:18 markd Exp $
+
+Work with kImageAnnotator 0.7.1
+
+--- CMakeLists.txt.orig        2023-11-30 17:00:43.000000000 +0000
++++ CMakeLists.txt
+@@ -166,12 +166,12 @@ if(NOT WITHOUT_X11)
+ endif()
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5")
+-    find_package(kImageAnnotator)
+-    set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator"; DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
+-    if(kImageAnnotator_FOUND)
++    find_package(kImageAnnotator-Qt5)
++    set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator"; DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
++    if(kImageAnnotator-Qt5_FOUND)
+         set(KIMAGEANNOTATOR_FOUND 1)
+-        find_package(kColorPicker REQUIRED)
+-        if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
++        find_package(kColorPicker-Qt5 REQUIRED)
++        if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.5.0)
+             set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
+         endif()
+     endif()

Index: pkgsrc/graphics/gwenview/patches/patch-app_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-app_CMakeLists.txt:1.1
--- /dev/null   Sat Aug 24 04:30:18 2024
+++ pkgsrc/graphics/gwenview/patches/patch-app_CMakeLists.txt   Sat Aug 24 04:30:18 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-app_CMakeLists.txt,v 1.1 2024/08/24 04:30:18 markd Exp $
+
+Work with kImageAnnotator 0.7.1
+
+--- app/CMakeLists.txt.orig    2023-11-30 17:00:43.000000000 +0000
++++ app/CMakeLists.txt
+@@ -157,6 +157,6 @@ target_link_libraries(slideshowfileitema
+     KF${QT_MAJOR_VERSION}::KIOWidgets
+     KF${QT_MAJOR_VERSION}::Notifications)
+ 
+-if(kImageAnnotator_FOUND)
++if(kImageAnnotator-Qt5_FOUND)
+     target_link_libraries(gwenview kImageAnnotator::kImageAnnotator)
+ endif()

Index: pkgsrc/graphics/gwenview/patches/patch-lib_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/gwenview/patches/patch-lib_CMakeLists.txt:1.4
--- /dev/null   Sat Aug 24 04:30:18 2024
+++ pkgsrc/graphics/gwenview/patches/patch-lib_CMakeLists.txt   Sat Aug 24 04:30:18 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_CMakeLists.txt,v 1.4 2024/08/24 04:30:18 markd Exp $
+
+Work with kImageAnnotator 0.7.1
+
+--- lib/CMakeLists.txt.orig    2023-11-30 17:00:43.000000000 +0000
++++ lib/CMakeLists.txt
+@@ -157,7 +157,7 @@ set(gwenviewlib_SRCS
+     touch/touch_helper.cpp
+     ${GV_JPEG_DIR}/transupp.c
+     )
+-if (kImageAnnotator_FOUND)
++if (kImageAnnotator-Qt5_FOUND)
+     set(gwenviewlib_SRCS ${gwenviewlib_SRCS}
+         annotate/annotatedialog.cpp
+         annotate/annotateoperation.cpp
+@@ -338,7 +338,7 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
+         )
+ endif()
+ 
+-if(kImageAnnotator_FOUND)
++if(kImageAnnotator-Qt5_FOUND)
+     target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator)
+ endif()
+