gnu: corectrl: Update to 1.5.1.

* gnu/packages/admin.scm (corectrl): Update to 1.5.1 and
remove outdated comment.
[source] <patches>: Remove corectrl-polkit-install-dir.patch,
add corectrl-locate-polkit-with-pkg-config.patch
[native-inputs]: Remove qttools-5; add qttools.
[inputs]: Remove qtcharts-5, qtdeclarative-5, qtsvg-5, qtwayland-5,
quazip-5; Add qtbase, qtcharts, qtdeclarative, qtsvg, qtwayland, quazip,
qt5compat.

* gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch:
Add file.

* gnu/packages/patches/corectrl-polkit-install-dir.patch: Delete file.

* gnu/local.mk (dist_patch_DATA): Register
corectrl-locate-polkit-with-pkg-config.patch, de-register
corectrl-polkit-install-dir.patch.

Change-Id: I4888e05ce67328a5ab269fb3aaac6bdb769ad4c9
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

4 files changed, 28 insertions, 35 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 7bac10b70d5..634895703f5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1124,7 +1124,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/containerd-fix-includes.patch            \
   %D%/packages/patches/cool-retro-term-wctype.patch		\
   %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch		\
-  %D%/packages/patches/corectrl-polkit-install-dir.patch	\
+  %D%/packages/patches/corectrl-locate-polkit-with-pkg-config.patch	\
   %D%/packages/patches/corefx-mono-5.4.0-patches.patch		\
   %D%/packages/patches/corefx-mono-pre-5.8.0-patches.patch	\
   %D%/packages/patches/coreutils-gnulib-tests.patch		\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index fd7c3e808f1..283612c9d1a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3471,7 +3471,7 @@ limits.")
 (define-public corectrl
   (package
     (name "corectrl")
-    (version "1.4.5")
+    (version "1.5.1")
     (source
      (origin
        (method git-fetch)
@@ -3480,8 +3480,8 @@ limits.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1gnqybf3s0bsm3qsbc6rd1spw09vxd417gn3hb6hflsj6377qfcb"))
-       (patches (search-patches "corectrl-polkit-install-dir.patch"))))
+        (base32 "0y2qjp73kl7m6sx99kc0myfvvlf0rjx2yb3hff7jr6l87ayan09p"))
+       (patches (search-patches "corectrl-locate-polkit-with-pkg-config.patch"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -3509,11 +3509,9 @@ limits.")
                 (("\"glxinfo\"")
                  (string-append
                   "\"" (search-input-file inputs "bin/glxinfo") "\""))))))))
-    ;; Text formatting only supported since C++20, which is available in gcc-13.
-    ;; https://en.cppreference.com/w/cpp/compiler_support#cpp_lib_format_201907L
     (native-inputs (list catch2-3.8
                          pkg-config
-                         qttools-5))
+                         qttools))
     (inputs (list dbus
                   botan
                   hwdata
@@ -3521,12 +3519,14 @@ limits.")
                   polkit
                   procps
                   pugixml
-                  qtcharts-5
-                  qtdeclarative-5
+                  qt5compat
+                  qtbase
+                  qtcharts
+                  qtdeclarative
                   qtquickcontrols2-5
-                  qtsvg-5
-                  qtwayland-5
-                  quazip-5
+                  qtsvg
+                  qtwayland
+                  quazip
                   spdlog
                   trompeloeil
                   units
diff --git a/gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch b/gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch
new file mode 100644
index 00000000000..4025df4b888
--- /dev/null
+++ b/gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch
@@ -0,0 +1,16 @@
+See https://gitlab.com/corectrl/corectrl/-/issues/493
+
+diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
+index 38deb12..7bbaa81 100644
+--- a/src/helper/CMakeLists.txt
++++ b/src/helper/CMakeLists.txt
+@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
+ option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF)
+ 
+ # Find polkit
++pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
+ if(NOT POLKIT_POLICY_INSTALL_DIR)
+-  pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
+   execute_process(
+     COMMAND pkg-config --variable=policydir polkit-gobject-1
+     RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
diff --git a/gnu/packages/patches/corectrl-polkit-install-dir.patch b/gnu/packages/patches/corectrl-polkit-install-dir.patch
deleted file mode 100644
index cced58996c9..00000000000
--- a/gnu/packages/patches/corectrl-polkit-install-dir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-See https://gitlab.com/corectrl/corectrl/-/issues/477
-
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index c262086..523ea97 100644
---- a/src/helper/CMakeLists.txt
-+++ b/src/helper/CMakeLists.txt
-@@ -26,15 +26,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
- 
- # Find polkit
- pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
--execute_process(
--  COMMAND pkg-config --variable=policydir polkit-gobject-1
--  RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
--  OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR
--  OUTPUT_STRIP_TRAILING_WHITESPACE
--)
--if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0")
--  message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config")
--endif()
-+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory")
- 
- list(APPEND HELPER_COMPILE_DEFINITIONS
-   SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE