CVS commit: pkgsrc/graphics/spectacle

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Aug 24 04:27:17 UTC 2024

Modified Files:
        pkgsrc/graphics/spectacle: Makefile distinfo
Added Files:
        pkgsrc/graphics/spectacle/patches: patch-CMakeLists.txt

Log Message:
spectacle: fix build with kimageannotator 0.7.1


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/spectacle/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/spectacle/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/spectacle/patches/patch-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/spectacle/Makefile
diff -u pkgsrc/graphics/spectacle/Makefile:1.40 pkgsrc/graphics/spectacle/Makefile:1.41
--- pkgsrc/graphics/spectacle/Makefile:1.40     Fri Aug  9 09:42:20 2024
+++ pkgsrc/graphics/spectacle/Makefile  Sat Aug 24 04:27:17 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2024/08/09 09:42:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2024/08/24 04:27:17 markd Exp $
 
 DISTNAME=      spectacle-${KAPPSVER}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    graphics
 
 HOMEPAGE=      https://kde.org/applications/graphics/kruler/

Index: pkgsrc/graphics/spectacle/distinfo
diff -u pkgsrc/graphics/spectacle/distinfo:1.7 pkgsrc/graphics/spectacle/distinfo:1.8
--- pkgsrc/graphics/spectacle/distinfo:1.7      Thu Sep 29 00:53:12 2022
+++ pkgsrc/graphics/spectacle/distinfo  Sat Aug 24 04:27:17 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2022/09/29 00:53:12 markd Exp $
+$NetBSD: distinfo,v 1.8 2024/08/24 04:27:17 markd Exp $
 
 BLAKE2s (spectacle-22.08.1.tar.xz) = 17ca1e4f6a2089aa2211fe8c6ac65c72431c3c51cfbfdfde023a59e5e2131225
 SHA512 (spectacle-22.08.1.tar.xz) = 183a02c16ff902ed02c8c4f281cc1ac6c84e5b6ba25cbdfcfb0d943dc2002953eb8a68d452106b1aa2c9b5a1af63dea01e9c417f4813838b88a6e6a21ba2ae2c
 Size (spectacle-22.08.1.tar.xz) = 1254520 bytes
+SHA1 (patch-CMakeLists.txt) = 706561939ff8afa585f286b7deb8259205d23a16

Added files:

Index: pkgsrc/graphics/spectacle/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/spectacle/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Aug 24 04:27:17 2024
+++ pkgsrc/graphics/spectacle/patches/patch-CMakeLists.txt      Sat Aug 24 04:27:17 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/08/24 04:27:17 markd Exp $
+
+Build with kImageAnnotator 0.7.1
+
+--- CMakeLists.txt.orig        2022-09-02 22:08:21.000000000 +0000
++++ CMakeLists.txt
+@@ -100,19 +100,19 @@ if(NOT XCB_CURSOR_FOUND)
+ endif()
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5") # For the moment kImageAnnotator is not ported to qt6
+-    find_package(kImageAnnotator)
++    find_package(kImageAnnotator-Qt5)
+ endif()
+-if(kImageAnnotator_FOUND)
++if(kImageAnnotator-Qt5_FOUND)
+     find_package(X11 REQUIRED)
+-    find_package(kColorPicker REQUIRED)
++    find_package(kColorPicker-Qt5 REQUIRED)
+     set(KIMAGEANNOTATOR_FOUND 1)
+-    if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
++    if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.5.0)
+         set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
+     endif()
+-    if(NOT kImageAnnotator_VERSION VERSION_LESS 0.6.0)
++    if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.6.0)
+         set(KIMAGEANNOTATOR_HAS_EXTRA_TOOLS 1)
+     endif()
+-    if(NOT kImageAnnotator_VERSION VERSION_LESS 0.6.1)
++    if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.6.1)
+         set(KIMAGEANNOTATOR_HAS_FIXED_SIZEHINT 1)
+     endif()
+ endif()