M gnu/local.mk => gnu/local.mk +1 -1
@@ 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 \
M gnu/packages/admin.scm => gnu/packages/admin.scm +11 -11
@@ 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
A gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch => gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch +16 -0
@@ 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
D gnu/packages/patches/corectrl-polkit-install-dir.patch => gnu/packages/patches/corectrl-polkit-install-dir.patch +0 -23
@@ 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