[packages/ka5-gwenview] - fix building with split kImageAnnotator, rel 2

[baggins]

commit 19f6a94c72f11de1dcee5cb5bf84b40f3dfa862d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 10 21:47:12 2025 +0200

    - fix building with split kImageAnnotator, rel 2

 kImageAnnotator.patch    | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 ka5-gwenview-exiv2.patch | 10 ----------
 ka5-gwenview.spec        |  9 ++++++---
 3 files changed, 58 insertions(+), 13 deletions(-)
---
diff --git a/ka5-gwenview.spec b/ka5-gwenview.spec
index 238a8a4..23872ea 100644
--- a/ka5-gwenview.spec
+++ b/ka5-gwenview.spec
@@ -9,14 +9,15 @@ Summary:	Simple image viewer
 Summary(pl.UTF-8):	Prosta przeglądarka obrazów
 Name:		ka5-%{kaname}
 Version:	23.08.5
-Release:	1
+Release:	2
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Applications
 Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 # Source0-md5:	dded6bc13018cb19276257158a428be0
-Patch0:		%{name}-exiv2.patch
+Patch0:		kImageAnnotator.patch
 URL:		https://kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5WaylandClient-devel >= %{qtver}
 BuildRequires:	cfitsio-devel
 BuildRequires:	cmake >= 3.20
 BuildRequires:	exiv2-devel
@@ -30,9 +31,11 @@ BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
 BuildRequires:	kf5-kactivities-devel >= %{kframever}
 BuildRequires:	kf5-kdelibs4support-devel >= %{kframever}
 BuildRequires:	kf5-kio-devel >= %{kframever}
+BuildRequires:	kf5-purpose-devel >= %{kframever}
 BuildRequires:	lcms2-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libtiff-devel
 BuildRequires:	ninja
 BuildRequires:	pkgconfig
 BuildRequires:	python
@@ -74,7 +77,7 @@ Dane dla %{kaname}.
 
 %prep
 %setup -q -n %{kaname}-%{version}
-#%%patch0
+%patch -P0 -p1
 
 %build
 %cmake \
diff --git a/kImageAnnotator.patch b/kImageAnnotator.patch
new file mode 100644
index 0000000..83e6918
--- /dev/null
+++ b/kImageAnnotator.patch
@@ -0,0 +1,52 @@
+--- gwenview-23.08.5/CMakeLists.txt~	2024-02-13 04:59:31.000000000 +0100
++++ gwenview-23.08.5/CMakeLists.txt	2025-10-10 21:23:13.293329094 +0200
+@@ -166,14 +166,12 @@
+ 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)
+-            set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
+-        endif()
++        find_package(kColorPicker-Qt5 REQUIRED)
++        set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
+     endif()
+ endif()
+ 
+--- gwenview-23.08.5/app/CMakeLists.txt~	2024-02-13 04:59:31.000000000 +0100
++++ gwenview-23.08.5/app/CMakeLists.txt	2025-10-10 21:42:47.753329300 +0200
+@@ -157,6 +157,6 @@
+     KF${QT_MAJOR_VERSION}::KIOWidgets
+     KF${QT_MAJOR_VERSION}::Notifications)
+ 
+-if(kImageAnnotator_FOUND)
++if(kImageAnnotator-Qt5_FOUND)
+     target_link_libraries(gwenview kImageAnnotator::kImageAnnotator)
+ endif()
+--- gwenview-23.08.5/lib/CMakeLists.txt~	2024-02-13 04:59:31.000000000 +0100
++++ gwenview-23.08.5/lib/CMakeLists.txt	2025-10-10 21:43:22.319995988 +0200
+@@ -157,7 +157,7 @@
+     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 @@
+         )
+ endif()
+ 
+-if(kImageAnnotator_FOUND)
++if(kImageAnnotator-Qt5_FOUND)
+     target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator)
+ endif()
+ 
diff --git a/ka5-gwenview-exiv2.patch b/ka5-gwenview-exiv2.patch
deleted file mode 100644
index 79bd8a1..0000000
--- a/ka5-gwenview-exiv2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/imagemetainfomodel.cpp~	2019-05-02 12:46:30.000000000 +0200
-+++ lib/imagemetainfomodel.cpp	2019-12-02 10:32:22.166379522 +0100
-@@ -34,6 +34,7 @@
- 
- // Exiv2
- #include <exiv2/exif.hpp>
-+#include <exiv2/error.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/iptc.hpp>
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-gwenview.git/commitdiff/19f6a94c72f11de1dcee5cb5bf84b40f3dfa862d