gwenview: bump version

kde-base/gwenview/gwenview-23.08.5.recipe

@@ -11,11 +11,11 @@ Functions both as a standalone application and an embedded viewer in the \
 Konqueror web browser
 Can be extended using KIPI plugins."
 HOMEPAGE="https://www.kde.org/applications/graphics/gwenview/"
-COPYRIGHT="2010-2022 KDE Organisation"
+COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/gwenview-$portVersion.tar.xz"
-CHECKSUM_SHA256="73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05"
+CHECKSUM_SHA256="a4fcd1c053b750d26ea8a9183208ecb5ed1d9b281625de3393e14f8bdc169038"
 PATCHES="gwenview-$portVersion.patchset"
 ADDITIONAL_FILES="gwenview.rdef.in"
 
@@ -56,6 +56,7 @@ REQUIRES="
 	lib:libKF5KIOWidgets$secondaryArchSuffix
 	lib:libKF5Notifications$secondaryArchSuffix
 	lib:libKF5Parts$secondaryArchSuffix
+	lib:libKF5Purpose$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
 	lib:libKF5SonnetUi$secondaryArchSuffix
@@ -80,7 +81,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.93
+	extra_cmake_modules$secondaryArchSuffix
 	devel:libexiv2$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
@@ -108,6 +109,7 @@ BUILD_REQUIRES="
 	devel:libKF5KIOWidgets$secondaryArchSuffix
 	devel:libKF5Notifications$secondaryArchSuffix
 	devel:libKF5Parts$secondaryArchSuffix
+	devel:libKF5Purpose$secondaryArchSuffix
 	devel:libKF5Service$secondaryArchSuffix
 	devel:libKF5Solid$secondaryArchSuffix
 	devel:libKF5SonnetUi$secondaryArchSuffix
@@ -128,7 +130,7 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
-	cmd:python2
+	cmd:python3
 	"
 
 BUILD()
@@ -145,7 +147,8 @@ BUILD()
 		-DINCLUDE_INSTALL_DIR=$includeDir \
 		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
 		-DSHARE_INSTALL_PREFIX=$dataDir \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DGWENVIEW_NO_WAYLAND_GESTURES=ON
 
 	make $jobArgs
 }

kde-base/gwenview/patches/gwenview-22.04.0.patchset

@@ -1,24 +0,0 @@
-From 031f5fecce06278a3efa2e80b10f48d91fa638e9 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 23 Apr 2018 12:34:51 +0300
-Subject: Fix build on Haiku
-
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 5f135a4..370b731 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -273,6 +273,10 @@ if(HAVE_FITS)
-     target_link_libraries(gwenviewlib ${CFITSIO_LIBRARIES})
- endif()
- 
-+if(HAIKU)
-+    target_link_libraries(gwenviewlib network intl iconv expat)
-+endif()
-+
- if (WIN32)
-     target_link_libraries(gwenviewlib ${EXPAT_LIBRARIES})
- endif()
--- 
-2.16.2
-

kde-base/gwenview/patches/gwenview-23.08.5.patchset

@@ -0,0 +1,68 @@
+From c31fe9eeaaa0aa57bf1bb718e0bd2b2d34b8cd03 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Mon, 23 Apr 2018 12:34:51 +0300
+Subject: Fix build on Haiku
+
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 05a2ea6..6645f65 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -310,6 +310,10 @@ if(HAVE_FITS)
+     target_link_libraries(gwenviewlib ${CFITSIO_LIBRARIES})
+ endif()
+ 
++if(HAIKU)
++    target_link_libraries(gwenviewlib network intl iconv expat)
++endif()
++
+ if (WIN32)
+     target_link_libraries(gwenviewlib ${EXPAT_LIBRARIES})
+ endif()
+-- 
+2.43.2
+
+
+From 62ca605de7f12016b70981c401075c2671f53bc7 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 5 Mar 2024 22:40:47 +1000
+Subject: Disable wayland
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01db0fb..000c98c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,7 +54,7 @@ else()
+     set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
+ endif()
+ 
+-if (APPLE OR NOT UNIX)
++if (APPLE OR NOT UNIX OR HAIKU)
+     set(GWENVIEW_NO_WAYLAND_GESTURES ON)
+ endif()
+ 
+@@ -165,7 +165,7 @@ if(NOT WITHOUT_X11)
+     endif()
+ endif()
+ 
+-if (QT_MAJOR_VERSION STREQUAL "5")
++if (QT_MAJOR_VERSION STREQUAL "5" AND NOT HAIKU)
+     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)
+diff --git a/lib/documentview/documentview.cpp b/lib/documentview/documentview.cpp
+index c547d67..5ed0ae0 100644
+--- a/lib/documentview/documentview.cpp
++++ b/lib/documentview/documentview.cpp
+@@ -51,6 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #include <KUrlMimeData>
+ 
+ // Local
++#include "config-gwenview.h"
+ #include "gwenview_lib_debug.h"
+ #include <lib/document/documentfactory.h>
+ #include <lib/documentview/abstractrasterimageviewtool.h>
+-- 
+2.43.2
+