gnu: hotspot: Update to 1.6.0.

* gnu/packages/linux.scm (hotspot): Update to 1.6.0.

Fixes: #8982
Change-Id: I80d6573b3e5724262c4c14ef6b55beec9cb7434f

1 files changed, 115 insertions, 119 deletions

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2cc50f474fd..48224a69987 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8522,128 +8522,124 @@ not as a replacement for it.")
                    license:gpl3+))))            ; everything else
 
 (define-public hotspot
-  ;; Use the latest git commit as it includes unreleased fixes for the test
-  ;; suite.
-  (let ((commit "5cec69301a3f34ada86ce9fe01a9538b04b3cf7c")
-        (revision "0"))
-    (package
-      (name "hotspot")
-      (version (git-version "1.5.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/KDAB/hotspot")
-                       (commit commit)
-                       ;; Include the bundled perfparser and PrefixTickLabels
-                       ;; libraries, which are to be used in source form.
-                       (recursive? #t)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "115gskjdcb1q3mgrnv1qcdrhxabjzl1hhkpk1klk67ayicsk1ym6"))))
-      (build-system qt-build-system)
-      (arguments
-       (list
-        ;; As mentioned in the option help text, the KAuth helper cannot be
-        ;; installed to a custom prefix and the build fails with "file cannot
-        ;; create directory: /polkit-1/actions.  Maybe need administrative"
-        ;; (see: https://bugs.kde.org/show_bug.cgi?id=363678).
-        #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF"
-                                  "-DQT6_BUILD=ON")
-        #:qtbase qtbase
-        ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with
-        ;; the later seemingly requiring sudo or access to the kernel
-        ;; trace points.
-        #:test-exclude
-        (string-append
-         "("
-         (string-join
-          ;; The 'tst_models' expected output doesn't exactly
-          ;; match.
-          '("tst_models"
-            ;; The 'tst_callgraphgenerator' perf invocation
-            ;; fails when run in the build container.
-            "tst_callgraphgenerator"
-            ;; The 'tst_perfparser' test requires sudo/access
-            ;; to the kernel scheduler trace points.
-            "tst_perfparser")
-          "|")
-         ")")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'patch-perfparser
-              ;; XXX: This phase is copied from qt-creator: keep them in sync!
-              (lambda* (#:key inputs #:allow-other-keys)
-                ;; perfparser attempts to dynamically load the demangle
-                ;; libraries; use their absolute file name to avoid having to
-                ;; set LD_LIBRARY_PATH.
-                (let ((librustc_demangle.so
-                       (with-exception-handler (lambda (ex)
-                                                 (if (search-error? ex)
-                                                     #f
-                                                     (raise-exception ex)))
-                         (lambda ()
-                           (search-input-file inputs "lib/librustc_demangle.so"))
-                         #:unwind? #t)))
-                  (substitute* "3rdparty/perfparser/app/demangler.cpp"
-                    (("loadDemangleLib\\(QStringLiteral\\(\"rustc_demangle\")"
-                      all)
-                     (if librustc_demangle.so
-                         (format #f "loadDemangleLib(QStringLiteral(~s)"
-                                 librustc_demangle.so)
-                         all))            ;no rustc_demangle; leave unchanged
-                    (("loadDemangleLib\\(QStringLiteral\\(\"d_demangle\")")
-                     (format #f "loadDemangleLib(QStringLiteral(~s)"
-                             (search-input-file inputs
-                                                "lib/libd_demangle.so")))))))
-            (add-after 'unpack 'path-paths
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "src/perfoutputwidgetkonsole.cpp"
-                  (("\"tail\"")
-                   (format #f "~s" (search-input-file inputs "bin/tail"))))
-                (substitute* "src/perfrecord.cpp"
-                  (("\"perf( )?\"" _ space)
-                   (string-append "\"" (search-input-file inputs "bin/perf")
-                                  (or space "") "\""))))))))
-      (native-inputs
-       (list extra-cmake-modules
-             vulkan-headers))
-      (inputs
-       (append
-        (list coreutils-minimal
-              d-demangler
-              elfutils
-              karchive
-              kconfig
-              kcoreaddons
-              kddockwidgets
-              kgraphviewer
-              ki18n
-              kio
-              kiconthemes
-              kitemmodels
-              kitemviews
-              knotifications
-              kparts
-              ksyntaxhighlighting
-              kwindowsystem
-              libxkbcommon
-              perf
-              qtdeclarative
-              qtsvg
-              solid
-              threadweaver
-              `(,zstd "lib"))
-        (if (supported-package? rust-rustc-demangle-capi-0.1)
-            (list rust-rustc-demangle-capi-0.1)
-            '())))
-      (home-page "https://github.com/KDAB/hotspot")
-      (synopsis "Performance analysis GUI for Linux perf")
-      (description "Hotspot is a standalone GUI for performance data analysis.
+  (package
+    (name "hotspot")
+    (version "1.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/KDAB/hotspot")
+                     (commit version)
+                     ;; Include the bundled perfparser and PrefixTickLabels
+                     ;; libraries, which are to be used in source form.
+                     (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "065pcibr4m2ixjlq9nf45g22f73zsxabll361bjjnmkfv6xhz1r4"))))
+    (build-system qt-build-system)
+    (arguments
+     (list
+      ;; As mentioned in the option help text, the KAuth helper cannot be
+      ;; installed to a custom prefix and the build fails with "file cannot
+      ;; create directory: /polkit-1/actions.  Maybe need administrative"
+      ;; (see: <https://bugs.kde.org/show_bug.cgi?id=363678>).
+      #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF"
+                                "-DQT6_BUILD=ON")
+      #:qtbase qtbase
+      ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with
+      ;; the later seemingly requiring sudo or access to the kernel
+      ;; trace points.
+      #:test-exclude
+      (string-append
+       "("
+       (string-join
+        ;; The 'tst_models' expected output doesn't exactly
+        ;; match.
+        '("tst_models"
+          ;; The 'tst_callgraphgenerator' perf invocation
+          ;; fails when run in the build container.
+          "tst_callgraphgenerator"
+          ;; The 'tst_perfparser' test requires sudo/access
+          ;; to the kernel scheduler trace points.
+          "tst_perfparser")
+        "|")
+       ")")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-perfparser
+            ;; XXX: This phase is copied from qt-creator: keep them in sync!
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; perfparser attempts to dynamically load the demangle
+              ;; libraries; use their absolute file name to avoid having to
+              ;; set LD_LIBRARY_PATH.
+              (let ((librustc_demangle.so
+                     (with-exception-handler (lambda (ex)
+                                               (if (search-error? ex)
+                                                   #f
+                                                   (raise-exception ex)))
+                       (lambda ()
+                         (search-input-file inputs "lib/librustc_demangle.so"))
+                       #:unwind? #t)))
+                (substitute* "3rdparty/perfparser/app/demangler.cpp"
+                  (("loadDemangleLib\\(QStringLiteral\\(\"rustc_demangle\")"
+                    all)
+                   (if librustc_demangle.so
+                       (format #f "loadDemangleLib(QStringLiteral(~s)"
+                               librustc_demangle.so)
+                       all))            ;no rustc_demangle; leave unchanged
+                  (("loadDemangleLib\\(QStringLiteral\\(\"d_demangle\")")
+                   (format #f "loadDemangleLib(QStringLiteral(~s)"
+                           (search-input-file inputs
+                                              "lib/libd_demangle.so")))))))
+          (add-after 'unpack 'path-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/perfoutputwidgetkonsole.cpp"
+                (("\"tail\"")
+                 (format #f "~s" (search-input-file inputs "bin/tail"))))
+              (substitute* "src/perfrecord.cpp"
+                (("\"perf( )?\"" _ space)
+                 (string-append "\"" (search-input-file inputs "bin/perf")
+                                (or space "") "\""))))))))
+    (native-inputs
+     (list extra-cmake-modules
+           vulkan-headers))
+    (inputs
+     (append
+      (list coreutils-minimal
+            d-demangler
+            elfutils
+            karchive
+            kconfig
+            kcoreaddons
+            kddockwidgets
+            kgraphviewer
+            ki18n
+            kio
+            kiconthemes
+            kitemmodels
+            kitemviews
+            knotifications
+            kparts
+            ksyntaxhighlighting
+            kwindowsystem
+            libxkbcommon
+            perf
+            qtdeclarative
+            qtsvg
+            solid
+            threadweaver
+            `(,zstd "lib"))
+      (if (supported-package? rust-rustc-demangle-capi-0.1)
+          (list rust-rustc-demangle-capi-0.1)
+          '())))
+    (home-page "https://github.com/KDAB/hotspot")
+    (synopsis "Performance analysis GUI for Linux perf")
+    (description "Hotspot is a standalone GUI for performance data analysis.
 It aims to be similar to KCachegrind, but for data collected with
 @command{perf}, a profiler for use with the kernel Linux.  Its main feature is
 graphically visualizing a @file{perf.data} file.")
-      (license (list license:gpl2+ license:gpl3+))))) ;dual licensed
+    (license (list license:gpl2+ license:gpl3+)))) ;dual licensed
 
 (define-public ecryptfs-utils
   (package