From 11a31d452d45b17bb4f6caa1a44aa232f2f829e6 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 6 Jul 2024 17:14:33 +0800 Subject: [PATCH] gnu: khelpcenter: Update to 24.05.2. * gnu/packages/kde-systemtools.scm (khelpcenter): Update to 24.05.2. [inputs]: Remove grantlee, khtml, kinit, kjs, and qtbase-5; add ktexttemplate, qtbase, and qtwebengine. [native-inputs]: Add perl. [arguments] Enable tests. <#:phases>: Add add-miss-package phase, adjust wrap-executable phase. Change-Id: I94fb420f27a67c1c33a749bb6fd834ba40632e96 --- gnu/packages/kde-systemtools.scm | 50 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index a89eeb5c3f..4923854a7c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages search) #:use-module (gnu packages vnc) + #:use-module (gnu packages perl) #:use-module (gnu packages xml) #:use-module (gnu packages icu4c) #:use-module (gnu packages xorg) @@ -136,49 +137,56 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") (define-public khelpcenter (package (name "khelpcenter") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/khelpcenter-" version ".tar.xz")) (sha256 - (base32 "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y")))) + (base32 "0y6smxc64mxpv535rih1m50wy4lf4gzsp944snvxrb4gj8q9sgy1")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools perl)) (inputs - (list grantlee - karchive + (list karchive kbookmarks kcodecs kconfig kcoreaddons kdbusaddons - khtml ki18n - kinit kio - kjs kparts kservice + ktexttemplate kwindowsystem libxml2 breeze-icons ;; default icon set - qtbase-5 - xapian)) + qtbase + xapian + qtwebengine)) (arguments - (list #:tests? #f ;;1/1 test fails - #:phases #~(modify-phases %standard-phases - (add-after 'install 'wrap-executable - (lambda* (#:key inputs #:allow-other-keys) - ;; Since qt-wrap selectors do not wrap for /share/kf5 - ;; directories, we need this so khelpcenter can find html4.css. - (wrap-program (string-append #$output - "/bin/khelpcenter") - `("XDG_DATA_DIRS" suffix - (,(string-append (assoc-ref inputs "khtml") - "/share"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-miss-package + (lambda _ + ;; https://invent.kde.org/system/khelpcenter/-/merge_requests/50 + (substitute* "CMakeLists.txt" + ((" WebEngineWidgets") + " WebEngineWidgets + PrintSupport") + (("Qt6::WebEngineWidgets") + "Qt6::PrintSupport + Qt6::WebEngineWidgets")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output + "/bin/khelpcenter") + `("QTWEBENGINEPROCESS_PATH" = + (,(search-input-file + inputs + "lib/qt6/libexec/QtWebEngineProcess"))))))))) (home-page "https://apps.kde.org/khelpcenter/") (synopsis "KDE documentation viewer") (description "KHelpCenter uses meta data files which describe the