Subject: [bug#50862] [PATCH core-updates-frozen 14/19] gnu: KDE Utils: Update to 21.08.2.

From: Brendan Tildesley <[email-masked]>
Date: Fri, 15 Oct 2021 20:30:10 +1100

(ark kate kmag kmousetool kmouth okteta sweeper): Update to 21.08.2.

(ark): [home-page]: Lint URL.

(kate): [inputs]: Add  ksyntaxhighlighting.
Use breeze-icons over oxygen-icons as default.
[arguments]: Enable all tests that pass.

(kmag): [inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(kmousetool, kmouth, kronometer, krusader, rsibreak, sweeper):
[inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(kxstitch): [home-page]: Lint URL.

(okteta): Update to 0.26.6.
[origin]: Update URI.
[inputs]: Use breeze-icons over oxygen-icons as default. Add
qtdeclarative.
[home-page]: Lint URL.

(smb4k): Update to 3.1.1.
[origin]: File downloads as "download" and thus can't be extracted
without renaming it.
[inputs]: Add kdnssd. Use breeze-icons over oxygen-icons as default.
---
 gnu/packages/kde-utils.scm | 91 +++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 47e25409ee..1e50a9618f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -40,14 +40,14 @@
 (define-public ark
   (package
     (name "ark")
-    (version "20.04.1")
+    (version "21.08.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/ark-" version ".tar.xz"))
               (sha256
                (base32
-                "0g5bfa1lc7mhrc2ngd4ldf33dpwr7gqrj95kp897pf632wwj23iw"))
+                "0hxzd0qr07wyz5v76nj4qj4db4lav53xapknmakif1fkghj1r51g"))
               ;; The libarchive package in Guix does not support
               ;; xar; disable related tests.
               (patches (search-patches "ark-skip-xar-test.patch"))))
@@ -106,7 +106,7 @@
        ("unzip" ,unzip)
        ("zip" ,zip)
        ("zstd" ,zstd)))
-    (home-page "https://apps.kde.org/en/ark")
+    (home-page "https://apps.kde.org/ark/")
     (synopsis "Graphical archiving tool")
     (description "Ark is a graphical file compression/decompression utility
 with support for multiple formats, including tar, gzip, bzip2, rar and zip, as
@@ -116,14 +116,14 @@ well as CD-ROM images.")
 (define-public kate
   (package
     (name "kate")
-    (version "20.04.1")
+    (version "21.08.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kate-" version ".tar.xz"))
        (sha256
-        (base32 "0nrby307syrqlxrf9lwdzc9c15ifw47418qwszqwg345ma2pww7i"))))
+        (base32 "1cm6iq3cqmp0kvsxhv0vlqy1dyzmis9fb0a6298q0lyjkmsri26n"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -142,23 +142,30 @@ well as CD-ROM images.")
        ("kio" ,kio)
        ("kjobwidgets" ,kjobwidgets)
        ("kparts" ,kparts)
+       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
        ("ktexteditor" ,ktexteditor)
        ("kwallet" ,kwallet)
        ("plasma-framework" ,plasma-framework)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)))
     (arguments
-     `(#:tests? #f ;; 2/7 tests fail
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'check-setup
            (lambda _
              ;; make Qt render "offscreen", required for tests
              (setenv "QT_QPA_PLATFORM" "offscreen")
              (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+             #t))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests? ;; Test looks for /usr/bin. Other ones hang.
+               (invoke "ctest" "-E" "(plugin-externaltools_test|\
+kateapp-session_manager_test|\
+kateapp-sessions_action_test)"))
              #t)))))
     (home-page "https://kate-editor.org/")
     (synopsis "Multi-document, multi-view text editor")
@@ -183,14 +190,14 @@ Kate's features include:
 (define-public kmag
   (package
     (name "kmag")
-    (version "20.04.1")
+    (version "21.08.2")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmag-" version ".tar.xz"))
       (sha256
-       (base32 "18lk8i2r90gvw8q5j179xgpniih92mwk06krk7w4jv98yinqf6m5"))))
+       (base32 "0y68vg95fjhfsjvvn2i214jrv06f6811j1asjxrgvwcmwdf0fnc0"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -199,10 +206,10 @@ Kate's features include:
      `(("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ;; TODO: QAccessibilityClient - libqaccessibilityclien
        ("qtbase" ,qtbase-5)))
-    (home-page "https://kde.org/applications/utilities/org.kde.kmag")
+    (home-page "https://apps.kde.org/kmag/")
     (synopsis "Screen magnifier tool")
     (description "You can use KMagnifier to magnify a part of the screen just
 as you would use a lens to magnify a newspaper fine-print or a photograph.
@@ -214,14 +221,14 @@ artists to web-designers to people with low vision.")
 (define-public kmousetool
   (package
     (name "kmousetool")
-    (version "20.04.1")
+    (version "21.08.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmousetool-" version ".tar.xz"))
        (sha256
-        (base32 "01j6bx8zihns4ip8maj0gb3w3bhx1ha2ljhfmsm6lcyay531ay98"))))
+        (base32 "1b09z6793zjjspcrhz4f1vxk3zbs4qdrkdp59q61i7ganm49znma"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -239,9 +246,9 @@ artists to web-designers to people with low vision.")
        ("libxtst" ,libxtst)
        ("libxt" ,libxt)
        ("phonon" ,phonon)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)))
-    (home-page "https://kde.org/applications/utilities/org.kde.kmousetool")
+    (home-page "https://apps.kde.org/kmousetool/")
     (synopsis "Automatic mouse click and mouse manipulation tool for the
 disabled")
     (description "KMouseTool clicks the mouse whenever the mouse cursor pauses
@@ -253,14 +260,14 @@ whom pressing buttons hurts.")
 (define-public kmouth
   (package
     (name "kmouth")
-    (version "20.04.1")
+    (version "21.08.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmouth-" version ".tar.xz"))
        (sha256
-        (base32 "1afgxlys9mvmc3rd33g7gchfb0ylx83x3x0a0qf3dra6cpgsgcg7"))))
+        (base32 "1b9bc0vnqihaqa4wfa9sqcrq92q1kyw0w1ikkx3pb8rzdzkk4cv2"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -275,10 +282,10 @@ whom pressing buttons hurts.")
        ("kio" ,kio)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
        ("qtspeech" ,qtspeech)))
-    (home-page "https://kde.org/applications/utilities/org.kde.kmouth")
+    (home-page "https://apps.kde.org/kmouth/")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
 to let their computer speak, e.g. mutal people or people who have lost their
@@ -314,9 +321,9 @@ sentences to be re-spoken.")
        ("ki18n" ,ki18n)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)))
-    (home-page "https://kde.org/applications/utilities/org.kde.kronometer")
+    (home-page "https://apps.kde.org/kronometer/")
     (synopsis "Simple stopwatch application")
     (description "Kronometer is a stopwatch application.  It features the
 basic stopwatch actions (pause, resume, reset, laps), as well as the ability
@@ -358,11 +365,11 @@ to save the times and resume them later.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
        ("solid" ,solid)
        ("zlib" ,zlib)))
-    (home-page "https://www.krusader.org")
+    (home-page "https://krusader.org/")
     (synopsis "Twin-panel (commander-style) file manager")
     (description "Krusader is a simple, easy, yet powerful,
 twin-panel (commander-style) file manager, similar to Midnight Commander or
@@ -400,7 +407,7 @@ great on your desktop.")
        ("imagemagick" ,imagemagick)
        ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
-    (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
+    (home-page "https://apps.kde.org/kxstitch/")
     (synopsis "Create and print cross stitch patterns")
     (description
      "KXStitch allows creating and printing cross stitch patterns, which can
@@ -410,15 +417,14 @@ either be created or generated from a image.")
 (define-public okteta
   (package
     (name "okteta")
-    (version "17.12.3")
+    (version "0.26.6")
     (source
      (origin
        (method url-fetch)
-       ;; TODO: Why is this not in "stable" anymore
-       (uri (string-append "mirror://kde/Attic/applications/" version
+       (uri (string-append "mirror://kde/stable/okteta/" version
                            "/src/okteta-" version ".tar.xz"))
        (sha256
-        (base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"))))
+        (base32 "0k0lw2z5iii6z7rg7ijjm8kc9248n1i92p2v3bglcgjhamdwssf5"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -441,9 +447,10 @@ either be created or generated from a image.")
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
+       ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)))
     (arguments
      `(#:phases
@@ -454,7 +461,7 @@ either be created or generated from a image.")
              (setenv "QT_QPA_PLATFORM" "offscreen")
              (setenv "HOME" "/tmp/dummy-home")
              #t)))))
-    (home-page "https://kde.org/applications/utilities/org.kde.okteta")
+    (home-page "https://apps.kde.org/okteta/")
     (synopsis "Hexadecimal editor for binary files")
     (description "Okteta is a simple editor for the raw data of files.  This
 type of program is also called hex editor or binary editor.
@@ -500,9 +507,9 @@ redone.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)))
-    (home-page "https://kde.org/applications/utilities/org.kde.rsibreak")
+    (home-page "https://apps.kde.org/rsibreak/")
     (synopsis "Assists in the Recovery and Prevention of Repetitive Strain
 Injury")
     (description "Repetitive Strain Injury is an illness which can occur as a
@@ -514,14 +521,15 @@ remind you to take a break now and then.")
 (define-public smb4k
   (package
     (name "smb4k")
-    (version "3.0.6")
+    (version "3.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://sourceforge.net/projects/smb4k/files/"
                            version "/smb4k-" version ".tar.xz/download"))
+       (file-name (string-append name "-" version ".tar.xz"))
        (sha256
-        (base32 "0hz6nfd845bykf78s4g2qs77szl96gy6g8rpg44pqd39a0k0xbh7"))))
+        (base32 "189h5znan2kfqflik308ghqc2z55s5z8kwpq8gjz2y0lwyqdiw0b"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -533,6 +541,7 @@ remind you to take a break now and then.")
        ("kcompletion" ,kcompletion)
        ("kcoreaddons" ,kcoreaddons)
        ("kcrash" ,kcrash)
+       ("kdnssd" ,kdnssd)
        ("kdbusaddons" ,kdbusaddons)
        ("ki18n" ,ki18n)
        ("kiconthemes" ,kiconthemes)
@@ -546,12 +555,12 @@ remind you to take a break now and then.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("libsmbclient" ,samba)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("plasma-framework" ,plasma-framework)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)))
-    (home-page "https://kde.org/applications/utilities/org.kde.smb4k")
+    (home-page "https://apps.kde.org/smb4k/")
     (synopsis "Samba (SMB) share advanced browser")
     (description "Smb4K is an network neighborhood browser for the KDE
 Software Compilation and a frontend to the programs of the Samba software
@@ -586,14 +595,14 @@ Features:
 (define-public sweeper
   (package
     (name "sweeper")
-    (version "20.04.1")
+    (version "21.08.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/sweeper-" version ".tar.xz"))
        (sha256
-        (base32 "1az3c2khnh51bbmqpamj4p26d3a0ff4l5rd3vcrylg94mk7wgh59"))))
+        (base32 "1yvcfdhapml1vzqns67v6j2c39g752f8czxs7bnczi69fq1ksh0b"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -609,9 +618,9 @@ Features:
        ("kio" ,kio)
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
+       ("breeze-icons" ,breeze-icons) ;; default icon set
        ("qtbase" ,qtbase-5)))
-    (home-page "https://kde.org/applications/utilities/org.kde.sweeper")
+    (home-page "https://apps.kde.org/sweeper/")
     (synopsis "Temporary file and history cleaner")
     (description "
 Sweeper helps to clean unwanted traces the user leaves on the system and to
-- 
2.33.0