git: 1e08136a9eb9 - main - graphics/kcolorpicker: Update to 0.3.1

The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1e08136a9eb93a7af2d89bd311cfad1129f00498

commit 1e08136a9eb93a7af2d89bd311cfad1129f00498
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-05-01 06:48:07 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-05-01 23:58:25 +0000

    graphics/kcolorpicker: Update to 0.3.1
---
 graphics/kcolorpicker/Makefile                   |  2 +-
 graphics/kcolorpicker/distinfo                   |  6 +++---
 graphics/kcolorpicker/files/patch-CMakeLists.txt | 10 ++++++++++
 graphics/kcolorpicker/pkg-plist                  |  4 ++--
 graphics/ksnip/files/patch-CMakeLists.txt        |  6 ++++--
 graphics/ksnip/files/patch-src_CMakeLists.txt    | 11 -----------
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/graphics/kcolorpicker/Makefile b/graphics/kcolorpicker/Makefile
index 6899f1a9e90c..17f9f169b59c 100644
--- a/graphics/kcolorpicker/Makefile
+++ b/graphics/kcolorpicker/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kColorPicker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.0
+DISTVERSION=	0.3.1
 CATEGORIES=	graphics kde
 PKGNAMESUFFIX=	-${FLAVOR}
 
diff --git a/graphics/kcolorpicker/distinfo b/graphics/kcolorpicker/distinfo
index a5697cc5ae49..d4915df28251 100644
--- a/graphics/kcolorpicker/distinfo
+++ b/graphics/kcolorpicker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706133480
-SHA256 (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = cab1efae1ca345a831dc6975b81c344da5c9425d934d73584dd7d0d512af3946
-SIZE (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = 12998
+TIMESTAMP = 1714541691
+SHA256 (ksnip-kColorPicker-v0.3.1_GH0.tar.gz) = e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7
+SIZE (ksnip-kColorPicker-v0.3.1_GH0.tar.gz) = 12861
diff --git a/graphics/kcolorpicker/files/patch-CMakeLists.txt b/graphics/kcolorpicker/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..bb65dc5e9f66
--- /dev/null
+++ b/graphics/kcolorpicker/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2024-05-01 05:41:27 UTC
++++ CMakeLists.txt
+@@ -65,6 +65,7 @@ set_target_properties(kColorPicker
+ 					  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
+ 		 			  VERSION ${PROJECT_VERSION}
+ 					  SOVERSION 0
++					  OUTPUT_NAME kColorPicker-Qt${QT_MAJOR_VERSION}
+ 					  )
+ 
+ install(TARGETS kColorPicker
diff --git a/graphics/kcolorpicker/pkg-plist b/graphics/kcolorpicker/pkg-plist
index 6686f2421287..fb5a775efecb 100644
--- a/graphics/kcolorpicker/pkg-plist
+++ b/graphics/kcolorpicker/pkg-plist
@@ -1,7 +1,7 @@
 include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPicker.h
 include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPickerExport.h
-lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets.cmake
+lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-targets.cmake
 lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config-version.cmake
 lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config.cmake
 lib/libkColorPicker-Qt%%QT_VER%%.so
diff --git a/graphics/ksnip/files/patch-CMakeLists.txt b/graphics/ksnip/files/patch-CMakeLists.txt
index 5e61c4b81bb2..ba8af04872fe 100644
--- a/graphics/ksnip/files/patch-CMakeLists.txt
+++ b/graphics/ksnip/files/patch-CMakeLists.txt
@@ -1,10 +1,12 @@
 --- CMakeLists.txt.orig	2023-03-15 09:08:40 UTC
 +++ CMakeLists.txt
-@@ -61,10 +61,10 @@ set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
+@@ -60,11 +60,11 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPO
+ 
  find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPONENTS})
  
- set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
+-set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
 -find_package(kImageAnnotator ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
++set(KIMAGEANNOTATOR_MIN_VERSION 0.7.0)
 +find_package(kImageAnnotator-Qt5 ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
  
 -set(KCOLORPICKER_MIN_VERSION 0.2.0)
diff --git a/graphics/ksnip/files/patch-src_CMakeLists.txt b/graphics/ksnip/files/patch-src_CMakeLists.txt
deleted file mode 100644
index f2c09bbd1540..000000000000
--- a/graphics/ksnip/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2024-01-26 06:54:23 UTC
-+++ src/CMakeLists.txt
-@@ -273,7 +273,7 @@ elseif (UNIX)
-                 Qt5::DBus
-                 Qt5::X11Extras
-                 kImageAnnotator::kImageAnnotator
--                kColorPicker::kColorPicker
-+                kColorPicker::kColorPicker-Qt5
-                 XCB::XFIXES
-                 )
-