z572 pushed a commit to branch kde-team in repository guix. commit 0bc3aaafcf5960291af4b804a9b3dd06c22d7700 Author: Zheng Junjie <zhengjun...@iscas.ac.cn> AuthorDate: Fri May 3 14:41:48 2024 +0800
gnu: drkonqi: Update to 6.0.4. * gnu/packages/kde-plasma.scm (drkonqi): Update to 6.0.4. [arguments]: Set #:qtbase to qtbase. <#:configure-flags>: add "-DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE" "-DWITH_GDB12=TRUE" "-DWITH_PYTHON_VENDORING=FALSE". [native-inputs]: Add pkg-config. [inputs]: Add kstatusnotifieritem, python-minimal, python-pygdbmi, python-chai, python-psutil, python-sentry-sdk, gdb, kcmutils-6, kitemmodels-6, kirigami-6. Use ki18n-6, kcoreaddons-6, kconfig-6, kservice-6, kdeclarative-6, kjobwidgets-6, kio-6, kcrash-6, kcompletion-6, kwidgetsaddons-6, kwallet-6, knotifications-6, kidletime-6, kwindowsystem-6 and qtdeclarative replace ki18n, kcoreaddons, kconfig, kservice, kdeclarative, kjobwidgets, kio, kcrash, kcompletion, kwidgetsaddons, kwallet, knotifications, kidletime, kwindowsystem and qtdeclarative-5. Change-Id: Id72d05815acf90451a778ce11fbb59704e2ccba8 Change-Id: I1eadd1a3efbe6b71ce09e319ec5bbb41e5555e80 --- gnu/packages/kde-plasma.scm | 85 ++++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c830ab2b1f..a918290801 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages firmware) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gdb) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnupg) #:use-module (gnu packages gl) @@ -69,6 +70,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages package-management) ; flatpak #:use-module (gnu packages unicode) #:use-module (gnu packages video) @@ -292,7 +294,7 @@ games, and tools.") (define-public drkonqi (package (name "drkonqi") - (version "5.27.7") + (version "6.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -300,32 +302,65 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8")))) + "041pxijr7cblvrvcil56ahnyzv4yjpz9mw979s6q0665pkp7mvp0")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "connectiontest"))))))) - (native-inputs (list extra-cmake-modules)) - (inputs (list ki18n - kcoreaddons - kconfig - kservice - kdeclarative - kjobwidgets - kio - kcrash - kcompletion - kwidgetsaddons - kwallet - knotifications - kidletime - kwindowsystem - ksyntaxhighlighting - qtdeclarative-5 - kuserfeedback)) + (list #:qtbase qtbase + #:configure-flags + #~(list "-DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE" + "-DWITH_GDB12=TRUE" + "-DWITH_PYTHON_VENDORING=FALSE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-gdb-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gdb (search-input-file inputs "/bin/gdb"))) + (substitute* "src/data/debuggers/internal/gdbrc" + (("TryExec=gdb") + (string-append "TryExec=" gdb "\n" + "CodeName=gdb")) + (("(Exec|ExecWithSymbolResolution)=gdb" _ letters) + (string-append letters "=" gdb)))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "(connectiontest|preambletest)")))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output + "/libexec/drkonqi") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))))))))) + (native-inputs (list extra-cmake-modules pkg-config)) + (inputs (list ki18n-6 + kcoreaddons-6 + kconfig-6 + kservice-6 + kdeclarative-6 + kjobwidgets-6 + kstatusnotifieritem + kio-6 + kcrash-6 + kcompletion-6 + kwidgetsaddons-6 + kwallet-6 + knotifications-6 + kidletime-6 + kwindowsystem-6 + qtdeclarative + kuserfeedback + + python-minimal + python-pygdbmi + python-chai + python-psutil + python-sentry-sdk + gdb + ;; qml module runtime dependency + ksyntaxhighlighting-6 + kcmutils-6 + kitemmodels-6 + kirigami-6)) (synopsis "Crash handler for KDE software") (description "This package provides an automatic handler for crashed apps.") (home-page "https://invent.kde.org/plasma/drkonqi")