gnu: gwenview: Update to 24.05.2.

* gnu/packages/kde.scm (gwenview): Update to 24.05.2.
[inputs]: Remove kactivities, qtimageformats-5, qtsvg-5, qtwayland-5, and
qtx11extras; add plasma-activities, ki18n, libxkbcommon,
qtimageformats, qtsvg, and qtwayland.
[source]: Remove patches.
[arguments]: Set #:qtbase to qtbase.

* gnu/packages/patches/gwenview-kimageannotator.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I962edcb3d59542eaf9eccd97c1e08d34ae7ab35b

3 files changed, 10 insertions, 39 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 7b9ad4daf0..695c8de3d2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1468,7 +1468,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch    	\
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
   %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
-  %D%/packages/patches/gwenview-kimageannotator.patch		\
   %D%/packages/patches/gzdoom-search-in-installed-share.patch	\
   %D%/packages/patches/gzdoom-find-system-libgme.patch	\
   %D%/packages/patches/hdf4-reproducibility.patch 		\
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8c4ec6ee70..f3604eb597 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -261,18 +261,18 @@ browser for easy news reading.")
 (define-public gwenview
   (package
     (name "gwenview")
-    (version "23.08.5")
+    (version "24.05.2")
     (source
      (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/release-service/" version
                             "/src/gwenview-" version ".tar.xz"))
         (sha256
-         (base32 "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54"))
-        (patches (search-patches "gwenview-kimageannotator.patch"))))
+         (base32 "0ybsra2c5dhagd8w81sccz3d9rfsj2mdnwrc4jcnkffjjk4ys09g"))))
     (build-system qt-build-system)
     (arguments
-     (list #:phases
+     (list #:qtbase qtbase
+           #:phases
            #~(modify-phases %standard-phases
                (replace 'check
                  (lambda* (#:key tests? #:allow-other-keys)
@@ -294,9 +294,10 @@ browser for easy news reading.")
      (list baloo
            cfitsio
            exiv2
-           kactivities
+           plasma-activities
            kcolorpicker
            kguiaddons
+           ki18n
            kiconthemes
            kimageannotator
            kio
@@ -308,12 +309,12 @@ browser for easy news reading.")
            libkdcraw
            libpng
            libtiff
+           libxkbcommon
            phonon
            purpose
-           qtimageformats-5
-           qtsvg-5
-           qtwayland-5
-           qtx11extras
+           qtimageformats
+           qtsvg
+           qtwayland
            wayland
            wayland-protocols
            zlib))
diff --git a/gnu/packages/patches/gwenview-kimageannotator.patch b/gnu/packages/patches/gwenview-kimageannotator.patch
deleted file mode 100644
index 92b994a0b5..0000000000
--- a/gnu/packages/patches/gwenview-kimageannotator.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date:                    2024-02-26
-Initial Package Version: 23.08.5
-Upstream Status:         Rejected (Qt6 port is primary now)
-Origin:                  Self
-Description:             Fixes building Gwenview with recent kImageAnnotator
-                         and kColorPicker versions by adjusting their paths
-                         and FOUND variables so that the correct libraries are
-                         selected.
-
---- gwenview-23.08.5.orig/CMakeLists.txt	2024-02-26 15:02:29.702754535 -0600
-+++ gwenview-23.08.5/CMakeLists.txt	2024-02-26 15:09:48.012866877 -0600
-@@ -166,11 +166,11 @@ 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)
--        set(KIMAGEANNOTATOR_FOUND 1)
--        find_package(kColorPicker REQUIRED)
-+    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-Qt5 REQUIRED)
-         if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
-             set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
-         endif()