[bug#50862,PATCHES] KDE updates (5.90, 22.12.2)

Message ID	SBPtopeaZeRjjm8ky-0TTYYSPNx5_rf6ilBbUzrihVGbKOfmfT2x6WL1Ghd48zrUX7_askh7UDKdUabDp0DSuYHGfxwEzdkAQoRg_U98oHQ=@protonmail.com
State	Accepted
Headers	show Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> Subject: [bug#50862] [PATCHES] KDE updates (5.90, 22.12.2) Resent-From: phodina <phodina@protonmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jul 2022 17:48:02 +0000 Resent-Message-ID: <handler.50862.B50862.16588576805136@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org To: "50862@debbugs.gnu.org" <50862@debbugs.gnu.org> Cc: Maxime Devos <maximedevos@telenet.be>, mail@brendan.scot, Leo Famulari <leo@famulari.name> Date: Tue, 26 Jul 2022 17:47:20 +0000 Message-ID: <SBPtopeaZeRjjm8ky-0TTYYSPNx5_rf6ilBbUzrihVGbKOfmfT2x6WL1Ghd48zrUX7_askh7UDKdUabDp0DSuYHGfxwEzdkAQoRg_U98oHQ=@protonmail.com> In-Reply-To: <be20d6c1-3dfd-b42d-e0c3-b56ab386d901@brendan.scot> References: <629540312.113485.1632806682555@office.mailbox.org> <836191564.431838.1647409371331@office.mailbox.org> <9b6ccc382725441c2fa53e83de00991f596b0b35.camel@telenet.be> <sX5-q2MFbv-VmPAK1VVeVvgFKXbmfJqcICKTpVssAMN5BDUF9RRAv6oD936ZX8bosRGFXdpp2zMOMbor5IWPfvXRPKpI-hZnhWAPr0wBoeY=@protonmail.com> <be20d6c1-3dfd-b42d-e0c3-b56ab386d901@brendan.scot> Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_l4YpZcSAG0hgkIIUDNJsF8PM2SH1ywEgGsFAKVs" Precedence: list Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> Reply-to: phodina <phodina@protonmail.com> From: phodina via Guix-patches via <guix-patches@gnu.org> X-getmail-retrieved-from-mailbox: Patches
Series	[bug#50862,PATCHES] KDE updates (5.90, 22.12.2) \| expand [bug#50862,PATCHES] KDE updates (5.90, 22.12.2)

Context	Check	Description
cbaines/applying patch	fail	View Laminar job
cbaines/issue	success	View issue

From 622235e7ed69c0b68e895b6550125fc00ba77b9f Mon Sep 17 00:00:00 2001 From: Brendan Tildesley <mail@brendan.scot> Date: Tue, 1 Feb 2022 18:34:57 +1100 Subject: [PATCH v2 04/75] gnu: KDE Frameworks: Update all packages to 5.92.0 * gnu/packages/kde-frameworks.scm (extra-cmake-modules, attica, bluez-qt, breeze-icons, kapidox, karchive, kcalendarcore, kcodecs, kconfig, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, kholidays, ki18n, kidletime, kirigami, kitemmodels, kitemviews, kplotting, ksyntaxhighlighting, kwayland, kwidgetsaddons, kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth, kcompletion, kcontacts, kcrash, kdoctools, kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty, kunitconversion, syndication, baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons, kglobalaccel, kiconthemes, kinit, kio, knewstuff, knotifyconfig, kparts, kpeople, krunner, kservice, ktexteditor, ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, plasma-framework, purpose, kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross, kdav): Update to 5.92.0. (extra-cmake-modules)[arguments]: Disable failing test. Don't run check phase after install. (bluez): [arguments]: Enable tests. (breeze-icons): [native-inputs]: Remove uneeded dependency libxml2, Add python-lxml, python. (kapidox): Use python-build-system. [native-inputs]: Remove extraneous input. kcalendarcore: [arguments]: Enable as many tests as possible. (kconfig): [native-inputs]: Remove no longer needed inputs. [arguments]: Disable failing test. (kcoreaddons): [arguments]: Remove old hack, disable broken tests. (ki18n): [arguments]: Disable failing tests. (kguiaddons): [inputs]: Add new dependencies qtwayland, wayland. (kwidgetsaddons): [arguments]: Disable another failing test. (kwayland): [inputs]: Add plasma-wayland-protocols. [arguments]: Enable working tests. (knotifications): [native-inputs]: add libcanberra, libdbusmenu-qt, qtdeclarative [arguments]: Respect tests? (sonnet): [inputs]: Add qtdeclarative. (kxmlgui): [inputs]: Add kguiaddons. (kxmlrpcclient): [source]: Update url. (plasma-framework): [arguments]: Enable all tests that work. [native-inputs]: Add kdoctools. (kpackage): [arguments]: Use substitution instead of patch. (kio): [inputs]: Add new dependencies. [native-inputs]: Add kdoctools. [arguments]: Enable all tests that work. (kdeclarative): [inputs]: Remove extraenous inputs. [propagated-inputs]: Propagate qtdeclarative, since it always seems to be needed. [native-inputs]: Add dbus to skip failing test. [arguments]: Replace check due to failing test. (solid): [arguments]: Respect tests?. (kdbusaddons): [arguments]: Respect tests?. Fix patch by replacing it with a substitution instead. (kholidays): [arguments]: Enable working test. (ksyntaxhighlighting): [arguments]: Don't patch file that doesn't exist any more. (kwindowsystem): [arguments]: Respect tests?. (modemmanager-qt): [arguments]: Respect tests?. (kauth): [arguments]: Respect tests?. (kfilemetadata): [arguments]: A different test fails now. (kunitconversion): [arguments]: Disable tests. (baloo): [arguments]: Enable tests. Respect tests?. (kconfigwidgets): Move qttools to native-inputs. (kded): [inputs]: Remove unneeded kinit input. [native-inputs]: Add kdoctools. (kdesignerplugin): [inputs]: Remove extraneous inputs. [native-inputs]: Add kdoctools. (kglobalaccel): [inputs]: Remove extraneous inputs. (kinit): [native-inputs]: Add kdoctools. (knewstuff): [inputs]: Add kpackage. (krunner): [arguments]: Disable failing tests. (kservice): [arguments]: Enable all tests that work. [native-inputs]: Add kdoctools. (ktexteditor): [arguments]: Enable all tests that work. (kwallet): [native-inputs]: Add kdoctools. (purpose): [arguments]: Remove unneeded hack. (kdelibs4support): Move qttools to native-inputs. [native-inputs]: Add kdoctools. (kcontacts): [inputs]: Add iso-codes since the tests look for some .json files from it. [arguments]: Disable failing test. (networkmanager-qt): [arguments]: Respect tests?. * gnu/local.mk: Delete references to deleted patches: kdbusaddons-kinit-file-name.patch kinit-kdeinit-libpath.patch kpackage-allow-external-paths.patch kpackage-fix-KF5PackageMacros.cmake.patch plasma-framework-fix-KF5PlasmaMacros.cmake.patch * gnu/packages/patches/kdbusaddons-kinit-file-name.patch: Delete file. * gnu/packages/patches/kinit-kdeinit-libpath.patch: Delete file. * gnu/packages/patches/kpackage-allow-external-paths.patch: Delete file. * gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch: Delete file. * gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch: Delete file. * gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Fix patch. PHODINA Kcontacts Squash diff --git a/gnu/local.mk b/gnu/local.mk index 07e3497d10..500f1be1ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1337,7 +1337,6 @@ dist_patch_DATA = \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/julia-allow-parallel-build.patch \ - %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ @@ -1351,14 +1350,11 @@ dist_patch_DATA = \ %D%/packages/patches/kiki-missing-includes.patch \ %D%/packages/patches/kiki-portability-64bit.patch \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ - %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kmail-Fix-missing-link-libraries.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ - %D%/packages/patches/kpackage-allow-external-paths.patch \ - %D%/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch \ %D%/packages/patches/kmplayer-aarch64.patch \ %D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ @@ -1597,7 +1593,6 @@ dist_patch_DATA = \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/pciutils-hurd-fix.patch \ %D%/packages/patches/pjproject-install-libpjsua2.patch \ - %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 35c3b68bda..875df10adf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -28,6 +28,7 @@ (define-module (gnu packages kde-frameworks) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -61,8 +62,10 @@ (define-module (gnu packages kde-frameworks) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages kerberos) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) @@ -88,7 +91,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +100,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "1vq3sd4qfr4hjcgqyfpykcz5wyagbfvrd4p24pdki1zjqn5j76pq")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too @@ -251,7 +254,7 @@ (define-public phonon-backend-gstreamer (define-public attica (package (name "attica") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -260,7 +263,7 @@ (define-public attica name "-" version ".tar.xz")) (sha256 (base32 - "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx")))) + "0cy9dd8kazfkhas87bxjj5smmzay3gvkjwsmy6gvkfxc6rvpqr5z")))) (build-system cmake-build-system) (arguments `(#:phases @@ -291,7 +294,7 @@ (define-public attica (define-public bluez-qt (package (name "bluez-qt") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -300,7 +303,7 @@ (define-public bluez-qt name "-" version ".tar.xz")) (sha256 (base32 - "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k")))) + "1dlasb39kqrcql6hq0sl74ax3n5bdcy3pkhvc9vwpf9dxn1j93gm")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules)) @@ -313,7 +316,13 @@ (define-public bluez-qt "-DUDEV_RULES_INSTALL_DIR=" #$output "/lib/udev/rules.d")) ;; TODO: Make tests pass: DBUS_FATAL_WARNINGS=0 still yields 7/8 tests ;; failing. When running after install, tests hang. - #:tests? #f)) + #:phases + '(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "QML wrapper for BlueZ") (description "bluez-qt is a Qt-style library for accessing the bluez @@ -323,7 +332,7 @@ (define-public bluez-qt (define-public breeze-icons (package (name "breeze-icons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -332,12 +341,15 @@ (define-public breeze-icons name "-" version ".tar.xz")) (sha256 (base32 - "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm")))) + "0rj30r52ca6njx00gmmni4k70yn8873ihxfbc66lklwzk1irdq29")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules fdupes libxml2)) + (list extra-cmake-modules fdupes + python python-lxml)) ;; For 24x24 icon generation (inputs (list qtbase-5)) + (arguments ;; fails because duplicate icons exist. TODO: try fix this. + `(#:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Default KDE Plasma 5 icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. @@ -350,7 +362,7 @@ (define-public breeze-icons (define-public kapidox (package (name "kapidox") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -359,12 +371,12 @@ (define-public kapidox name "-" version ".tar.xz")) (sha256 (base32 - "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j")))) - (build-system cmake-build-system) + "0vd5k4wmmawbhyy3cxj0gjidf4haghwbsbly9yr3zg3qb3g02ljg")))) + (build-system python-build-system) (arguments - `(#:tests? #f)) ; has no test target - (native-inputs - (list extra-cmake-modules)) + `(#:tests? #f ; has no test target + #:phases (modify-phases %standard-phases + (delete 'sanity-check)))) ;its insane. (propagated-inputs ;; kapidox is a python programm ;; TODO: check if doxygen has to be installed, the readme does not @@ -390,7 +402,7 @@ (define-public kapidox (define-public karchive (package (name "karchive") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -399,12 +411,14 @@ (define-public karchive name "-" version ".tar.xz")) (sha256 (base32 - "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm")))) + "1blzm6vf8kpflam4671r1y4svrsb79bglln7aia7baqh7a6a4xjh")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) + ;; pkg-config ;; For zstd (inputs (list bzip2 qtbase-5 xz zlib)) + ;; `(,zstd "lib") ;; FIXME: Tests fail with zstd (home-page "https://community.kde.org/Frameworks") (synopsis "Qt 5 addon providing access to numerous types of archives") (description "KArchive provides classes for easy reading, creation and @@ -421,7 +435,7 @@ (define-public karchive (define-public kcalendarcore (package (name "kcalendarcore") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -430,7 +444,7 @@ (define-public kcalendarcore name "-" version ".tar.xz")) (sha256 (base32 - "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2")))) + "0fhbas8i7i08z4x32yq49admiz8vk4h9vwgkh7qy14lbzf6ydwkg")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl tzdata-for-tests)) @@ -439,30 +453,20 @@ (define-public kcalendarcore (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'disable-failing-libical3-tests - (lambda _ - ;; testicaltimezones fails with some time-zone issue - (substitute* "autotests/CMakeLists.txt" - (("macro_unit_tests\$testicaltimezones\$" line) - (string-append "## " line)) - (("target_link_libraries\\(testicaltimezones " line) - (string-append "## " line))) - (for-each - delete-file - (list - ;; test cases are generated for each .ics file. These fail: - "autotests/data/Compat-libical3/AppleICal_1.5.ics" - "autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics" - "autotests/data/Compat-libical3/KOrganizer_3.1a.ics" - "autotests/data/Compat-libical3/MSExchange.ics" - "autotests/data/Compat-libical3/Mozilla_1.0.ics")) - #t)) - (add-before 'check 'set-timezone - (lambda* (#:key inputs #:allow-other-keys) + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test + (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "TZ" "Europe/Prague") (setenv "TZDIR" (search-input-directory inputs - "share/zoneinfo"))))))) + "share/zoneinfo")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Its already been fixed upstream; remove in 5.93. + ;; c0428a284444b995d320046c04ef5377d51e4c5c + (invoke "ctest" "-E" "testdateserialization")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for interfacing with calendars") (description "This library provides access to and handling of calendar @@ -478,7 +482,7 @@ (define-public kcalendarcore (define-public kcodecs (package (name "kcodecs") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -487,7 +491,7 @@ (define-public kcodecs name "-" version ".tar.xz")) (sha256 (base32 - "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) + "0xfjc0diljx081as3b500awybay9l3sfl59792h5z3clafjbgrfn")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules gperf qttools)) @@ -512,7 +516,7 @@ (define-public kcodecs (define-public kconfig (package (name "kconfig") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -521,25 +525,23 @@ (define-public kconfig name "-" version ".tar.xz")) (sha256 (base32 - "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) + "08q57f3wxj22d485s0ph53p44yrkjb376817470a0s43p10vc0bq")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools - xorg-server-for-tests)) + (list extra-cmake-modules qttools)) (inputs (list qtbase-5)) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t)) (replace 'check - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ +kconfiggui-kstandardshortcutwatchertest)")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -574,7 +576,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -583,39 +585,23 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0rv63byrxwf9zdpx347rxybpk2j9yyjqm323j60vb8ja6a7p2pyz")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info + (list extra-cmake-modules qttools shared-mime-info)) ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam - xorg-server-for-tests)) ; for the tests (inputs (list qtbase-5)) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'blacklist-failing-test - (lambda _ - ;; Blacklist failing tests. - (with-output-to-file "autotests/BLACKLIST" - (lambda _ - ;; FIXME: Make it pass. Test failure caused by stout/stderr - ;; being interleaved. - (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\$waitForRecreationSignal\\(watch, existingFile\$\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) - (add-before 'check 'check-setup - (lambda _ + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) + (when tests? ;; kdirwatch test fails inconsistently. kprocesstest fails. + (invoke "ctest" "-E" "(kdirwatch_qfswatch_unittest|kprocesstest|\ +kdirwatch_stat_unittest)")) #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") @@ -629,7 +615,7 @@ (define-public kcoreaddons (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -638,27 +624,29 @@ (define-public kdbusaddons name "-" version ".tar.xz")) (sha256 (base32 - "1vz2hg5p8wvfk0pi8v25zqzcn8yj7ykakxjyipmadvi02c1h8gic")) - (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) + "0m5fd396xi3dhc45zwxjrrxr2bhlrc8g8m7n17jq1ylzqhyg60vw")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus qttools)) (inputs - (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. + (list qtbase-5 qtx11extras kinit-bootstrap)) + ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (arguments `(#:phases (modify-phases %standard-phases - (add-before - 'configure 'patch-source + (add-before 'configure 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; look for the kdeinit5 executable in kinit's store directory, ;; instead of the current application's directory: (substitute* "src/kdeinitinterface.cpp" - (("@SUBSTITUTEME@") (assoc-ref inputs "kinit"))))) + (("<< QCoreApplication::applicationDirPath..") + (string-append + "<< QString::fromUtf8(\"" (assoc-ref inputs "kinit") "/bin\")" ))))) (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Convenience classes for DBus") (description "KDBusAddons provides convenience classes on top of QtDBus, @@ -670,7 +658,7 @@ (define-public kdbusaddons (define-public kdnssd (package (name "kdnssd") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -679,7 +667,7 @@ (define-public kdnssd name "-" version ".tar.xz")) (sha256 (base32 - "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) + "1m24v36pphy591z1xp90i0yxv70c62iinvy4gspdi15bz94sydjz")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -725,7 +713,7 @@ (define-public kgraphviewer (define-public kguiaddons (package (name "kguiaddons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -734,7 +722,7 @@ (define-public kguiaddons name "-" version ".tar.xz")) (sha256 (base32 - "1yndjdhb9zzlhh74xccpys38balm5dma56sx6bwwfrga1phq0g5l")))) + "0pyzgyrglvz2m11b82rycs9fbmzpfgzabnjkvsq00agjcnjparqg")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -743,7 +731,7 @@ (define-public kguiaddons (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtx11extras)) + (list qtbase-5 qtwayland qtx11extras wayland)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user @@ -753,7 +741,7 @@ (define-public kguiaddons (define-public kholidays (package (name "kholidays") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -761,18 +749,8 @@ (define-public kholidays (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1rifx51yk24sk578h08s1bwpqb61rnyyks33zpl82lcdnl1ljp26")))) + (base32 "042bdg46hkpg66vdp9gk13wck5yhks8s6i9qz9xzh2mikz285lqf")))) (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; blacklist a failing test function TODO: make it pass - (with-output-to-file "autotests/BLACKLIST" - (lambda _ - (display "[testDefaultRegions]\n*\n"))) - #t))))) (native-inputs (list extra-cmake-modules qttools)) (inputs @@ -786,7 +764,7 @@ (define-public kholidays (define-public ki18n (package (name "ki18n") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -795,7 +773,7 @@ (define-public ki18n name "-" version ".tar.xz")) (sha256 (base32 - "1f952488492sm904i1iwgjp2gc7z07312mlshw4ckh2801y0qclc")))) + "0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -803,14 +781,15 @@ (define-public ki18n (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative qtscript iso-codes)) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - #t))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "ctest" "-E" "(kcountrytest|kcountrysubdivisiontest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Gettext-based UI text internationalization") (description "KI18n provides functionality for internationalizing user @@ -827,7 +806,7 @@ (define-public ki18n (define-public kidletime (package (name "kidletime") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -836,7 +815,7 @@ (define-public kidletime name "-" version ".tar.xz")) (sha256 (base32 - "0vbxs80a8kh2xbxclx8zwl7acynsasa7i0cs171fxr26d0dmmhm5")))) + "1mw0jarqv2ypxwgf4qaxqlw0sijw0is36sasrfz8grbykwi18bz1")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -856,7 +835,7 @@ (define-public kirigami ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -865,7 +844,7 @@ (define-public kirigami "kirigami2-" version ".tar.xz")) (sha256 (base32 - "0akkyif6n9l7hw4cj6nkf1zwgnd7vqi1gyiqmn588rspgl91zf1w")))) + "0p1x40p38pr9rvzwil57asgsaa95qpjqi9npwv4pgibhxacgznha")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -891,7 +870,7 @@ (define-public kirigami (define-public kitemmodels (package (name "kitemmodels") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -900,7 +879,7 @@ (define-public kitemmodels name "-" version ".tar.xz")) (sha256 (base32 - "0x7y5shg2pp490hvmkz81b8j01cha9j1001q34m7pnyf0n3zknzc")))) + "16z8m11cyrapf6m56gmpjmvcgan7s50si8rl1cbbid02src7yp76")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -941,7 +920,7 @@ (define-public kitemmodels (define-public kitemviews (package (name "kitemviews") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -950,7 +929,7 @@ (define-public kitemviews name "-" version ".tar.xz")) (sha256 (base32 - "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) + "1ml6i1km22xsprldkzmngfh9xs5vdhlfvc6f7aq5hx9q5114v2q5")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -966,7 +945,7 @@ (define-public kitemviews (define-public kplotting (package (name "kplotting") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -975,7 +954,7 @@ (define-public kplotting name "-" version ".tar.xz")) (sha256 (base32 - "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) + "1l8y0xlwjyv1l4g0mag4bgf906jc654ygky1bribzay4wki66pf9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -993,7 +972,7 @@ (define-public kplotting (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1002,7 +981,7 @@ (define-public ksyntaxhighlighting "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) + "03p5qzf13nbf54gzad3q1q6i33iggz3ik0ydr9szhj92kfppwd4r")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl qttools @@ -1017,9 +996,6 @@ (define-public ksyntaxhighlighting (lambda _ ;; revert the patch-shebang phase on scripts which are ;; in fact test data - (substitute* '("autotests/input/test.bash" - "autotests/folding/test.bash.fold") - (((which "bash")) "/bin/bash")) (substitute* '("autotests/input/highlight.sh" "autotests/folding/highlight.sh.fold") (((which "sh")) " /bin/sh")) ;; space in front! @@ -1064,7 +1040,7 @@ (define-public plasma-wayland-protocols (define-public kwayland (package (name "kwayland") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1073,20 +1049,21 @@ (define-public kwayland name "-" version ".tar.xz")) (sha256 (base32 - "0hrpbfzixjpnfy9q5x66q1fff0p7n80rrs127zzdv68pyi6456ry")))) + "15fizsbdl6psmi24fvpfk9dvh61q07irzavpkl961qp4zg79gq4m")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland wayland wayland-protocols)) + (list qtbase-5 plasma-wayland-protocols qtwayland wayland wayland-protocols)) (arguments - `(#:tests? #f ; FIXME tests require weston to run - ; weston requires wayland flags in mesa - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "XDG_RUNTIME_DIR" "/tmp") + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (when tests? ;; One test fails. + (invoke "ctest" "-E" "kwayland-testWaylandRegistry")) #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt-style API to interact with the wayland client and server") @@ -1101,7 +1078,7 @@ (define-public kwayland (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1110,7 +1087,7 @@ (define-public kwidgetsaddons name "-" version ".tar.xz")) (sha256 (base32 - "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) + "0b0z24j162j39zfycl5al69xcqgdsr96p7ii3prm1mbyda6mbqyh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools xorg-server-for-tests)) @@ -1119,12 +1096,12 @@ (define-public kwidgetsaddons (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-tests - (lambda _ - ;; It is unclear why this test suddenly started failing. - (substitute* "autotests/kcolumnresizertest.cpp" - ((".*QCOMPARE.*") "")) - #t))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + (invoke "ctest" "-E" "(ksqueezedtextlabelautotest|\ +kwidgetsaddons-kcolumnresizertest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Large set of desktop widgets") (description "Provided are action classes that can be added to toolbars or @@ -1136,7 +1113,7 @@ (define-public kwidgetsaddons (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1145,7 +1122,7 @@ (define-public kwindowsystem name "-" version ".tar.xz")) (sha256 (base32 - "0a68cj0bsl5a9sxfd969khznycrn9p6grp2b08hqacxqdknzs0wh")))) + "103xvhzlggi05k16s9kssy7g5a74k9yildj1a4igqwi39wmvvnyw")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules @@ -1172,16 +1149,18 @@ (define-public kwindowsystem (display "[testClientMachine]\n*\n"))) ;; requires network #t)) (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; The test suite requires a running window anager - (setenv "XDG_RUNTIME_DIR" "/tmp") - (system "Xvfb :1 -ac -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1") - (sleep 5) ;; Give Xvfb a few moments to get on it's feet - (system "openbox &") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (when tests? + (setenv "XDG_RUNTIME_DIR" "/tmp") + (system "Xvfb :1 -ac -screen 0 640x480x24 &") + (setenv "DISPLAY" ":1") + (sleep 5) ;; Give Xvfb a few moments to get on it's feet + (system "openbox &") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" "-E" + "kwindowsystem-kwindowsystemplatformwaylandtest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE access to the windowing system") (description "KWindowSystem provides information about and allows @@ -1199,7 +1178,7 @@ (define-public kwindowsystem (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1208,7 +1187,7 @@ (define-public modemmanager-qt name "-" version ".tar.xz")) (sha256 (base32 - "0ydq1l823jgp0yrrpqi1zdk5dsg65ydk1x082qwsa9a0vzs0np3x")))) + "162qzq1aqv2l3bi0r01xrfan20r1zhaaqih4dqbaj7vqibsb9l3y")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1221,9 +1200,11 @@ (define-public modemmanager-qt `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt wrapper for ModemManager DBus API") (description "ModemManagerQt provides access to all ModemManager features @@ -1235,7 +1216,7 @@ (define-public modemmanager-qt (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1244,7 +1225,7 @@ (define-public networkmanager-qt name "-" version ".tar.xz")) (sha256 (base32 - "1h2kdw5vs7mn3n7bvqwm36a48ra9iap6384kanz14zjbankj04c1")))) + "0r7s3fw9fk3pkrzrl1bxsmkf1qbgv3p0jrsskp28f3561vncipai")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1258,9 +1239,10 @@ (define-public networkmanager-qt `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt wrapper for NetworkManager DBus API") (description "NetworkManagerQt provides access to all NetworkManager @@ -1272,7 +1254,7 @@ (define-public networkmanager-qt (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1281,7 +1263,7 @@ (define-public oxygen-icons name "5" "-" version ".tar.xz")) (sha256 (base32 - "1rjsnz0g7zyzgii26sk370adb6jcyvr2lm8qi23fvqimifngqm2c")))) + "1wcy8bv4d6jns7vaisbvjc8nxriw9vkiz7j4za5ry7wnvlzv126a")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules fdupes)) @@ -1296,7 +1278,7 @@ (define-public oxygen-icons (define-public prison (package (name "prison") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -1304,7 +1286,7 @@ (define-public prison (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1qflivvb593d2npc218xkdn3w5zvl7x8v1b52ydnggsxzbgkqvb4")))) + (base32 "07p47q8sva82hglfzp145a1sajlal8b3qshhkicc9rkbsngywvvy")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1319,14 +1301,14 @@ (define-public prison (define-public pulseaudio-qt (package (name "pulseaudio-qt") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/pulseaudio-qt" "/pulseaudio-qt-" version ".tar.xz")) (sha256 (base32 - "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099")))) + "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -1346,7 +1328,7 @@ (define-public pulseaudio-qt (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1355,7 +1337,7 @@ (define-public qqc2-desktop-style name "-" version ".tar.xz")) (sha256 (base32 - "1n47cl082zqdw6ykil04rw6bws4fn1m8wfx4vxv1aqj9warbdks3")))) + "1b5xr71lan7ixvd1nfxy9wj21h4wwidsaxa192sha1d8p49hhlwp")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -1379,7 +1361,7 @@ (define-public qqc2-desktop-style (define-public solid (package (name "solid") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1388,15 +1370,16 @@ (define-public solid name "-" version ".tar.xz")) (sha256 (base32 - "0alng7ciw6xji0s2zrk8dsx1p0p9shrrfzl8wnkwygc5chnhysz7")))) + "172sid8l1znzxxz0hi5m19yy4vg7l1nbghvzjvh18ssbmxcwh9l9")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest"))))))) (native-inputs (list bison dbus extra-cmake-modules flex qttools)) (inputs @@ -1414,7 +1397,7 @@ (define-public solid (define-public sonnet (package (name "sonnet") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1423,13 +1406,14 @@ (define-public sonnet name "-" version ".tar.xz")) (sha256 (base32 - "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) + "08jps1hy0qvk62wnzn50qi8iaay7xav3hbcj55sk70mm7pd1vz1i")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list hunspell ;; TODO: hspell (for Hebrew), Voikko (for Finish) + qtdeclarative qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Multi-language spell checker") @@ -1441,7 +1425,7 @@ (define-public sonnet (define-public threadweaver (package (name "threadweaver") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1450,7 +1434,7 @@ (define-public threadweaver name "-" version ".tar.xz")) (sha256 (base32 - "0y1q0wy073lf11g4jrp4bdw4kpj4ibqfscsxj6zlh8ban9zlf389")))) + "008in2wbl6zr404m9hbqdvy3d4r06mmb3jrr13myldwljqywzc28")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1471,7 +1455,7 @@ (define-public threadweaver (define-public kactivities (package (name "kactivities") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1480,7 +1464,7 @@ (define-public kactivities name "-" version ".tar.xz")) (sha256 (base32 - "1whsp0f87lrcn61s9rfhy0aj68hm6zgfa38mq6frlkcjksi0z1vn")))) + "1kfvg23gdl4k6azs6700j8i8ncl8c7rrc70w1i2xhphz27ybc1pw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1516,7 +1500,7 @@ (define-public kactivities (define-public kauth (package (name "kauth") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1525,7 +1509,7 @@ (define-public kauth name "-" version ".tar.xz")) (sha256 (base32 - "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) + "0a27z9xr5ccxfcxmx93vs4hgxc388nsd9ac906mdh475ivv4p0j4")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules qttools)) @@ -1546,9 +1530,10 @@ (define-public kauth (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") "${KDE_INSTALL_LIBEXECDIR}")))) (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Execute actions as privileged user") (description "KAuth provides a convenient, system-integrated way to offload @@ -1559,7 +1544,7 @@ (define-public kauth (define-public kcompletion (package (name "kcompletion") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1568,7 +1553,7 @@ (define-public kcompletion name "-" version ".tar.xz")) (sha256 (base32 - "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) + "1svwvj9jxkgcddfdila10ggdmsabs22vnhf9k7isp2zfdif55w88")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1584,7 +1569,7 @@ (define-public kcompletion (define-public kcontacts (package (name "kcontacts") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1593,7 +1578,7 @@ (define-public kcontacts name "-" version ".tar.xz")) (sha256 (base32 - "182ma11z3kqxq3cwy7kwprfqkb9bcmn44w7k9vixbid4pv5wa0lb")))) + "1kik4pvy8snvj6rsc9pfbcpc8rrcn0k4pjj1h9m221zma1p00xhj")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules xorg-server)) ; for the tests @@ -1601,18 +1586,28 @@ (define-public kcontacts (list qtbase-5)) (propagated-inputs (list ;; As required by KF5ContactsConfig.cmake. - kcodecs kconfig kcoreaddons ki18n)) + iso-codes kcodecs kconfig kcoreaddons qtdeclarative ki18n)) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) ;; The test suite requires a running X server. ;; Xvfb doesn't have proper glx support and needs a pixeldepth ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" ;; "Could not initialize GLX" - (system "Xvfb :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1") + (when tests? + (setenv "HOME" (getcwd)) + (system "Xvfb :1 -screen 0 640x480x24 &") + (setenv "DISPLAY" ":1") + ;; testrounddrip fail inconsistently. + ;; addresstest produces wrong value: + ;;Actual (address.formattedAddress(QStringLiteral("Jim Knopf"))): + ;;"Jim Knopf\nLummerlandstr. 1\n12345 Lummerstadt\n\nGERMANY" + ;;Expected (result) : + ;;"Jim Knopf\nLummerlandstr. 1\n12345 Lummerstadt\n\nGERMANIA" + (invoke "ctest" "-E" + "(kcontacts-addresstest|kcontacts-testroundtrip|kcontacts-impptest|kcontacts-birthdaytest|kcontacts-addresseetest)")) #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "API for contacts/address book data following the vCard standard") @@ -1625,7 +1620,7 @@ (define-public kcontacts (define-public kcrash (package (name "kcrash") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1634,7 +1629,7 @@ (define-public kcrash name "-" version ".tar.xz")) (sha256 (base32 - "11sy9hrjpvybqi53qjrnncy9mzifrb3vqxi2d12ldjzqyqd8pirp")))) + "1ir64mlv49vh3vz81r22q3sx0fichiwjr8qw5jf5vx96a1dn1icv")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1649,7 +1644,7 @@ (define-public kcrash (define-public kdoctools (package (name "kdoctools") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1658,7 +1653,7 @@ (define-public kdoctools name "-" version ".tar.xz")) (sha256 (base32 - "0g0k83np2xaxk05spf14h5fvzy0n7kbcwx1sa9wjh570f6jx87am")))) + "0w08fa8rl0dhp59lv6xcvypahl6pxda6cr0vv0f0xv0xp6wax8w6")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1706,7 +1701,7 @@ (define-public kdoctools (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1715,25 +1710,22 @@ (define-public kfilemetadata name "-" version ".tar.xz")) (sha256 (base32 - "18n1a5857090a1c1rxzd07sxs652gl6wr3n99sp8rxmvkghn9zsj")))) + "1khmx9kd1jhd6j7rmfww3vmyjz2pg36mpsdn0bc77kwl21ax696n")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-failing-test - (lambda _ - ;; Blacklist a failing test-function. FIXME: Make it pass. - ;; UserMetaDataWriterTest fails with getxattr("…/writertest.txt") - ;; -> EOPNOTSUPP (Operation not supported) - (with-output-to-file "autotests/BLACKLIST" - (lambda _ - (display "[testMimetype]\n*\n") - (display "[test]\n*\n"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: Test can't find audio/x-speex mimeinfo + ;; (but it can find audio/x-speex+ogg). + (invoke "ctest" "-E" + "(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config) - ("python-2" ,python-2))) + ("pkg-config" ,pkg-config))) (inputs (list attr ;; TODO: EPub http://sourceforge.net/projects/ebook-tools @@ -1760,7 +1752,7 @@ (define-public kfilemetadata (define-public kimageformats (package (name "kimageformats") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1769,7 +1761,7 @@ (define-public kimageformats name "-" version ".tar.xz")) (sha256 (base32 - "0pk4b725wapzdxv1mm6ddqcl6z8ffcpr32i5vrhrin8awi5gx13s")))) + "0sd3xhqh3zgy4jq8fc1llqjrxizylbsz58njz2dxqjas2a4rj16f")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -1813,7 +1805,7 @@ (define-public kimageformats (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1822,7 +1814,7 @@ (define-public kjobwidgets name "-" version ".tar.xz")) (sha256 (base32 - "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) + "09l5zgr5mn29v410ng5rccdg2bki9r6cb8y2lrijzgfxfxpvj96z")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1837,7 +1829,7 @@ (define-public kjobwidgets (define-public knotifications (package (name "knotifications") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1846,7 +1838,7 @@ (define-public knotifications name "-" version ".tar.xz")) (sha256 (base32 - "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) + "1dwlx8w810l0cvy72mj52saf4x7i9p3xpqpjx4chy54n7mg0jklc")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus qttools)) @@ -1855,23 +1847,23 @@ (define-public knotifications kconfig kcoreaddons kwindowsystem + libcanberra + libdbusmenu-qt phonon + qtdeclarative qtbase-5 qtspeech - ;; TODO: Think about adding dbusmenu-qt5 from - ;; https://launchpad.net/libdbusmenu-qt qtx11extras)) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - #t)) (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Desktop notifications") (description "KNotification is used to notify the user of an event. It @@ -1881,7 +1873,7 @@ (define-public knotifications (define-public kpackage (package (name "kpackage") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1890,11 +1882,7 @@ (define-public kpackage name "-" version ".tar.xz")) (sha256 (base32 - "03rp7p7i8ihz5wg58gjs638jk7xbszknfiy2j3r979snc57g95mv")) - ;; Default to: external paths/symlinks can be followed by a - ;; package - (patches (search-patches "kpackage-allow-external-paths.patch" - "kpackage-fix-KF5PackageMacros.cmake.patch")))) + "1av6v0629a8yi0wpl7xgyd0gsn5gi228abdlvbk4dzrx9vxpa7rn")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1910,9 +1898,10 @@ (define-public kpackage (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ + (substitute* "src/kpackage/package.cpp" + (("externalPaths.false.") "externalPaths(true)")) ;; Make QDirIterator follow symlinks - (substitute* '("src/kpackage/packageloader.cpp" - "src/kpackage/private/packagejobthread.cpp") + (substitute* '("src/kpackage/packageloader.cpp") (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b)) (("^\\s*(QDirIterator it\$.*, QDirIterator::Subdirectories)(\$;)" _ a b) @@ -1943,7 +1932,7 @@ (define-public kpackage (define-public kpty (package (name "kpty") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1952,7 +1941,7 @@ (define-public kpty name "-" version ".tar.xz")) (sha256 (base32 - "1hp6iilr2asf2269linfazjv4yjg7rsi8wydxx53yyr99r0bgmah")))) + "0lp0bqlg1i0a5vl6gvvkngbsha8ab38z6b3sjvpmk83vixgsq7fb")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1979,7 +1968,7 @@ (define-public kpty (define-public kunitconversion (package (name "kunitconversion") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -1988,18 +1977,9 @@ (define-public kunitconversion name "-" version ".tar.xz")) (sha256 (base32 - "0sp4gfzpf40cdi0xnff9sn7b75z88j0589svz4rv77q5m137cgnn")))) + "17ph75rg3y652ii0yxm9s8xrbpjs9pdfsrsajm220mi9ng2b9qj7")))) (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-a-failing-test-case - (lambda _ - ;; FIXME: Re-enable this test-case. It was committed with the - ;; message: "tsan says it's clean, apart from issues in Qt - ;; (reported upstream)" - (substitute* "autotests/convertertest.cpp" - (("const int numThreads = 2") "const int numThreads = 0"))))))) + (arguments `(#:tests? #f)) ;; Requires network. (native-inputs (list extra-cmake-modules)) (inputs @@ -2015,7 +1995,7 @@ (define-public kunitconversion (define-public syndication (package (name "syndication") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2024,7 +2004,7 @@ (define-public syndication name "-" version ".tar.xz")) (sha256 (base32 - "1n3x8s1z4kd30xirfr07hi87vwhk4rilb5kslcjcgp5n9c0imcpv")))) + "0ijxpnsygwzzybic5lp8gfq57y84vrp3bq7vdbjh3h0345vvk6hw")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2047,7 +2027,7 @@ (define-public syndication (define-public baloo (package (name "baloo") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2056,7 +2036,7 @@ (define-public baloo name "-" version ".tar.xz")) (sha256 (base32 - "1cf5pp9hn3pqypwyzh63ksasap3n7qz6n3y2xgb83ss3fra90pjf")))) + "0xd4a0p22gjm523ymlyd5nfgp8z3ayb0nq6a04h5py507mc70d98")))) (build-system cmake-build-system) (propagated-inputs (list kcoreaddons kfilemetadata)) @@ -2083,17 +2063,6 @@ (define-public baloo (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (with-output-to-file "bin/BLACKLIST" - (lambda _ - ;; Blacklist some failing tests. FIXME: Make them pass. - (display "[testRenameFile]\n*\n") - (display "[testMoveFile]\n*\n"))) - #t)) (add-after 'unpack 'remove-failing-test (lambda _ ;; FIXME: kinotifytest broke in 5.70.0 with commit 73183acf00 and @@ -2106,9 +2075,12 @@ (define-public baloo (string-append all " AND NOT TRUE"))) #t)) (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "HOME" (getcwd)) + (invoke "dbus-launch" "ctest")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "File searching and indexing") (description "Baloo provides file searching and indexing. It does so by @@ -2119,7 +2091,7 @@ (define-public baloo (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2128,7 +2100,7 @@ (define-public kactivities-stats name "-" version ".tar.xz")) (sha256 (base32 - "1cnfdnxkw9hwbqdzdygp2vzwxqwqhxyipzwdcgar0clgnf7zi7wx")))) + "0lgp7zxgjmjm02x4mydlv6ivmlxqjkklav5vfwgjgf6v1qp161i2")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2145,7 +2117,7 @@ (define-public kactivities-stats (define-public kbookmarks (package (name "kbookmarks") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2154,7 +2126,7 @@ (define-public kbookmarks name "-" version ".tar.xz")) (sha256 (base32 - "1i5vcyvyc9whmflbcg2kc562ch93yscfic1c1n9z347g26jmgras")))) + "0hym3558xnp3h7q8kf1ljcy65r3g37mcmqb1ll3nxd912rv4wl4r")))) (build-system cmake-build-system) (propagated-inputs (list kwidgetsaddons)) @@ -2187,7 +2159,7 @@ (define-public kbookmarks (define-public kcmutils (package (name "kcmutils") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2196,7 +2168,7 @@ (define-public kcmutils name "-" version ".tar.xz")) (sha256 (base32 - "08f4yr546brl1dppp0khvsw9ihmh9a7rp505913pdhi0sklaiimz")))) + "0fldpkhq4ysma4m6qylr7kqvxw0rb11x5abz5921bhl5zicfcjfx")))) (build-system cmake-build-system) (propagated-inputs (list kconfigwidgets kservice)) @@ -2215,6 +2187,10 @@ (define-public kcmutils ;; print plugin name when loading fails (("^\\s*(qWarning\$\$ << \"Error loading) (plugin:\")( << loader\\.errorString\$\$;)" _ a b c) (string-append a " KCM plugin\" << mod.service()->library() << \":\"" c))) + #t)) + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (inputs (list kauth @@ -2240,7 +2216,7 @@ (define-public kcmutils (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2249,19 +2225,18 @@ (define-public kconfigwidgets name "-" version ".tar.xz")) (sha256 (base32 - "195dw7nyr3fp78y3vfnyjh0hwgwk46f80wdcm8dck5rkscl3v9xz")))) + "0ji799xd45lpnd70a9bizicfz2bsmlxq6r0fqgn0ghwsbp9ywna2")))) (build-system qt-build-system) (propagated-inputs (list kauth kcodecs kconfig kwidgetsaddons)) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list kcoreaddons kguiaddons ki18n ;; todo: PythonModuleGeneration - qtbase-5 - qttools)) + qtbase-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -2271,6 +2246,13 @@ (define-public kconfigwidgets ;; make QDirIterator follow symlinks (("^\\s*(QDirIterator it\$.*, QDirIterator::Subdirectories)(\$;)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "CMakeLists.txt" + (("5\\.90\\.0") "5.92.0")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "kstandardactiontest")) #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for configuration dialogs") @@ -2283,7 +2265,7 @@ (define-public kconfigwidgets (define-public kdeclarative (package (name "kdeclarative") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2292,33 +2274,27 @@ (define-public kdeclarative name "-" version ".tar.xz")) (sha256 (base32 - "1vq9pkrb0zsphi2sfx7cyy1kb6pklzjkmqdf5202z8vydlkc4549")))) + "1cymh8clcajk9cl6r443cpqk6vmp4x12ngc6wgp08z53zrvlv5py")))) (build-system cmake-build-system) (propagated-inputs - (list kconfig kpackage)) + (list kconfig kpackage qtdeclarative)) (native-inputs - (list extra-cmake-modules pkg-config xorg-server-for-tests)) + (list dbus extra-cmake-modules pkg-config xorg-server-for-tests)) (inputs (list kauth - kbookmarks - kcodecs - kcompletion - kconfigwidgets kcoreaddons kglobalaccel kguiaddons kiconthemes kio - kitemviews ki18n kjobwidgets + knotifications kservice kwidgetsaddons kwindowsystem - kxmlgui libepoxy qtbase-5 - qtdeclarative solid)) (arguments `(#:phases @@ -2328,8 +2304,17 @@ (define-public kdeclarative ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. (system "Xvfb :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1") - #t))))) + (setenv "DISPLAY" ":1"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" + "-E" ; FIXME: test fails. + "fullmodelaccesstest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Integration of QML and KDE work spaces") (description "KDeclarative provides integration of QML and KDE work spaces. @@ -2342,7 +2327,7 @@ (define-public kdeclarative (define-public kded (package (name "kded") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2351,17 +2336,16 @@ (define-public kded name "-" version ".tar.xz")) (sha256 (base32 - "0zqd33vy4ny7g9as3bhd75qi1chz1nlqq133pgw8kjanvghwwnk9")))) + "0v0fak84nw4lb4qc1irb9sn5nh5k7qrhnfav5smn3cvchldm6dc3")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules kdoctools)) (inputs (list kconfig kcoreaddons kcrash kdbusaddons kdoctools - kinit kservice qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -2375,7 +2359,7 @@ (define-public kded (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2384,28 +2368,15 @@ (define-public kdesignerplugin name "-" version ".tar.xz")) (sha256 (base32 - "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) + "0kial8k6qr39871v103952d0qcs0hm25y6k0vdg4y8ns8nrmjs06")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list kconfig kcoreaddons kdoctools - qtbase-5 - ;; optional: - kcompletion - kconfigwidgets - kiconthemes - kitemviews - kio - kplotting - ktextwidgets - kdewebkit - kwidgetsaddons - kxmlgui - qtwebkit - sonnet)) + qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Integrating KDE frameworks widgets with Qt Designer") (description "This framework provides plugins for Qt Designer that allow it @@ -2417,7 +2388,7 @@ (define-public kdesignerplugin (define-public kdesu (package (name "kdesu") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2426,7 +2397,7 @@ (define-public kdesu name "-" version ".tar.xz")) (sha256 (base32 - "17k29g7jwgqj5xdmr509438b9sq65zx8khdr4viybjf5xpi0cf5m")))) + "1yjyz4v0gn7ys7zy4ymn47zggxxmgd37big005c6g85dm63xr1s6")))) (build-system cmake-build-system) (propagated-inputs (list kpty)) @@ -2444,7 +2415,7 @@ (define-public kdesu (define-public kdewebkit (package (name "kdewebkit") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2453,7 +2424,7 @@ (define-public kdewebkit name "-" version ".tar.xz")) (sha256 (base32 - "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) + "1dni134qbs5yff7zgk4n3sfjwblzarblg16rj35l59l6mly7f2jd")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -2476,7 +2447,7 @@ (define-public kdewebkit (define-public kemoticons (package (name "kemoticons") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2485,7 +2456,7 @@ (define-public kemoticons name "-" version ".tar.xz")) (sha256 (base32 - "11v1srn3nii4j7cn4f19qvdw96pczwxhanzxlg4a9gf8kmnp5gxr")))) + "01wzy3mwfz4sqpq8i1hfbbymajp55axryiaqkfr9r2n1844y7kzx")))) (build-system cmake-build-system) (propagated-inputs (list kservice)) @@ -2513,7 +2484,7 @@ (define-public kemoticons (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2522,7 +2493,7 @@ (define-public kglobalaccel name "-" version ".tar.xz")) (sha256 (base32 - "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) + "0lhlb274pvv7rpkcsccqbv81bh8iklanp29g0k28wrv3kckiwyxy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) @@ -2531,9 +2502,7 @@ (define-public kglobalaccel kcrash kcoreaddons kdbusaddons - kservice kwindowsystem - libxcb qtbase-5 qtx11extras xcb-util-keysyms)) @@ -2547,7 +2516,7 @@ (define-public kglobalaccel (define-public kiconthemes (package (name "kiconthemes") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2556,7 +2525,7 @@ (define-public kiconthemes name "-" version ".tar.xz")) (sha256 (base32 - "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) + "08yb6f980p620dfklfiyp83lcsqw4dds9qwzd6xpn2mzz07p2a11")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools shared-mime-info)) @@ -2593,7 +2562,7 @@ (define-public kiconthemes (define-public kinit (package (name "kinit") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2602,11 +2571,10 @@ (define-public kinit name "-" version ".tar.xz")) (sha256 (base32 - "1x4whs8p1daxjfp4ksf70rxrv7fx3w17s5wh6446039wzz9bv6ki")) + "1kpkqnq9krxlzhripwjhw3n55p5sxqsvj6nb2pqb9m0ppw97jlfb")) ;; Use the store paths for other packages and dynamically loaded ;; libs - (patches (search-patches "kinit-kdeinit-extra_libs.patch" - "kinit-kdeinit-libpath.patch")))) + (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) (build-system cmake-build-system) (arguments `(#:phases @@ -2662,7 +2630,7 @@ (define-public kinit (define-public kio (package (name "kio") - (version "5.70.1") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2671,7 +2639,7 @@ (define-public kio name "-" version ".tar.xz")) (sha256 (base32 - "1f33jdjjx6k1d5fab35x8xakc4ny9fyfrgkbib60xncc82lz2h5l")) + "1cscsjb2v0zygzazfhcflc3gb5ny1a79g3i6glyzw6ppj2c3yhyl")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2686,7 +2654,7 @@ (define-public kio kxmlgui solid)) (native-inputs - (list dbus qttools extra-cmake-modules)) + (list extra-cmake-modules dbus kdoctools qttools)) (inputs `(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars> ("krb5" ,mit-krb5) @@ -2697,6 +2665,7 @@ (define-public kio ("kcrash" ,kcrash) ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) + ("kguiaddons" ,kguiaddons) ("kiconthemes" ,kiconthemes) ("ki18n" ,ki18n) ("knotifications" ,knotifications) @@ -2708,10 +2677,11 @@ (define-public kio ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtx11extras" ,qtx11extras) - ("sonnet" ,sonnet))) + ("sonnet" ,sonnet) + ("util-linux:lib" ,util-linux "lib") ; libmount + ("zlib" ,zlib))) (arguments - `(#:tests? #f ; FIXME: 41/50 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ @@ -2720,12 +2690,33 @@ (define-public kio (("(^\\s*qCWarning(KIOD_CATEGORY) << \"Error loading plugin:\")( << loader.errorString();)" _ a b) (string-append a "<< name" b))) #t)) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" + "-E" ; FIXME: 17/67 tests fail. + (string-append "(kiocore-jobtest" + "|fileitemtest" + "|kiocore-kmountpointtest" + "|kiocore-ktcpsockettest" + "|kiocore-mimetypefinderjobtest" + "|kiocore-http_jobtest" + "|kiogui-openurljobtest" + "|applicationlauncherjob_forkingtest" + "|applicationlauncherjob_scopetest" + "|applicationlauncherjob_servicetest" + "|commandlauncherjob_forkingtest" + "|commandlauncherjob_scopetest" + "|commandlauncherjob_servicetest" + "|kiowidgets-kdirmodeltest" + "|kiowidgets-kfileitemactionstest" + "|kiowidgets-kurifiltertest-colon-separator" + "|kiowidgets-kurifiltertest-space-separator" + "|kiofilewidgets-knewfilemenutest)"))) #t)) (add-after 'install 'add-symlinks ;; Some package(s) (e.g. bluedevil) refer to these service types by @@ -2736,10 +2727,6 @@ (define-public kio "/share/kservicetypes5/"))) (symlink (string-append kst5 "kfileitemactionplugin.desktop") (string-append kst5 "kfileitemaction-plugin.desktop")))))))) - ;;(replace 'check - ;; (lambda _ - ;; (setenv "DBUS_FATAL_WARNINGS" "0") - ;; (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Network transparent access to files and data") (description "This framework implements a lot of file management functions. @@ -2754,7 +2741,7 @@ (define-public kio (define-public knewstuff (package (name "knewstuff") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2763,7 +2750,7 @@ (define-public knewstuff name "-" version ".tar.xz")) (sha256 (base32 - "1hpxj4nawh57w8l64gjplb5mk5fpxiffm4x49kg75m637rxy19fq")))) + "0gvclv1a6xyrqa24svb56kp9zf2wi98as3q30lnwf0bpbpjsw52b")))) (build-system cmake-build-system) (propagated-inputs (list attica kservice kxmlgui)) @@ -2783,6 +2770,7 @@ (define-public knewstuff ki18n kiconthemes kjobwidgets + kpackage ktextwidgets kwidgetsaddons qtbase-5 @@ -2808,7 +2796,7 @@ (define-public knewstuff (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2817,7 +2805,7 @@ (define-public knotifyconfig name "-" version ".tar.xz")) (sha256 (base32 - "1d483qrgyamwsqvcl70klv1g8744hn8z1h2j3qfydcvlwz8jy0gj")))) + "0fii74r0ap3n08lp9kj7pki0msqjsia2jnmavyps51kq37im5x7p")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2850,7 +2838,7 @@ (define-public knotifyconfig (define-public kparts (package (name "kparts") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2859,7 +2847,7 @@ (define-public kparts name "-" version ".tar.xz")) (sha256 (base32 - "1gfaxr856zrsjxzdxw1sj12s6aib6r703jgf7yvsl8kilg8l2gsk")))) + "061kzss4b0bw67j3mc8h36mbaji077k3alk2ghcir7qix6r1hkh9")))) (build-system qt-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -2901,7 +2889,7 @@ (define-public kparts (define-public kpeople (package (name "kpeople") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2910,7 +2898,7 @@ (define-public kpeople name "-" version ".tar.xz")) (sha256 (base32 - "1dhvly19pj9lx78g7mc89scibzmra1vhv4zz33222zidkbrf9ryl")))) + "0wf555pqiannxb115mlbl43ds1365im95vadsbzv1gdz668p44xk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2937,7 +2925,7 @@ (define-public kpeople (define-public krunner (package (name "krunner") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -2946,7 +2934,7 @@ (define-public krunner name "-" version ".tar.xz")) (sha256 (base32 - "0fhb26vi9z1mky79kq12qq4g4ghz3530cx84n5l3sdgkd6nfsyqf")))) + "1vcgqjyx9i8k9q4j6q9p4f7sp76aap8gqn2v269lb7imcrfhrj1z")))) (build-system cmake-build-system) (propagated-inputs (list plasma-framework)) @@ -2987,20 +2975,15 @@ (define-public krunner (("//usr/bin\"") (string-append (getcwd) "\"")) ;; multiple path-parts (("/bin/ls") (search-input-file inputs "/bin/ls"))))) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; Blacklist some failing test-functions. FIXME: Make them pass. - (with-output-to-file "bin/BLACKLIST" - (lambda _ - (display "[testMatch]\n*\n") - (display "[testMulti]\n*\n"))) - #t)) (replace 'check - (lambda _ - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "dbus-launch" "ctest" + "-E" ;; Some tests fail + "(runnercontexttest|dbusrunnertest|\ +runnermanagersinglerunnermodetest|runnermanagertest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for Plasma runners") (description "The Plasma workspace provides an application called KRunner @@ -3012,7 +2995,7 @@ (define-public krunner (define-public kservice (package (name "kservice") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3021,17 +3004,16 @@ (define-public kservice name "-" version ".tar.xz")) (sha256 (base32 - "0g49p5331f7dl46rvi43akmjm1jx70w9797j6d17jy7z9s9sqikw")))) + "1y1fr1galhhi6yf9w9qcvkp1zb63ifvr4wb43jwpvpms9djxkqjj")))) (build-system cmake-build-system) (propagated-inputs - (list kconfig kcoreaddons)) + (list kconfig kcoreaddons kdoctools)) (native-inputs - (list bison extra-cmake-modules flex)) + (list bison extra-cmake-modules flex shared-mime-info)) (inputs (list kcrash kdbusaddons kdoctools ki18n qtbase-5)) (arguments - `(#:tests? #f ; FIXME: 6/10 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and @@ -3047,12 +3029,13 @@ (define-public kservice (("^\\s*QString resolved = QDir\$dir\$\\.canonicalPath\$\$;") "QString resolved = QDir::cleanPath(dir);")) #t)) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Disable failing tests. + (invoke "ctest" "-E" "(kautostarttest|ksycocatest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for desktop services") (description "KService provides a plugin framework for handling desktop @@ -3064,7 +3047,7 @@ (define-public kservice (define-public ktexteditor (package (name "ktexteditor") - (version "5.70.1") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3073,10 +3056,11 @@ (define-public ktexteditor "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "0k10yj1ia1w1mznj4g5nvp65p226zcvgwxc85ycn2w8lbkknidf7")))) + "137v8g7j8kkv9yh30ysmm5n6imyyd3jmd0f6w5ni00kxl0y1rl5w")))) (build-system cmake-build-system) (propagated-inputs - (list kparts)) + (list kparts + ksyntaxhighlighting)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs @@ -3096,7 +3080,6 @@ (define-public ktexteditor ki18n kjobwidgets kservice - ksyntaxhighlighting ktextwidgets kwidgetsaddons kxmlgui @@ -3109,19 +3092,18 @@ (define-public ktexteditor solid sonnet)) (arguments - `(#:tests? #f ; FIXME: 2/54 tests fail: Cannot find fontdirectory qtbase/lib/font - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'setup (lambda* (#:key inputs #:allow-other-keys) (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop (string-append (assoc-ref inputs "kparts") "/share")) #t)) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Maybe locale issues with tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kateview_test|movingrange_test)")) #t)) (add-after 'install 'add-symlinks ;; Some package(s) (e.g. plasma-sdk) refer to these service types @@ -3144,7 +3126,7 @@ (define-public ktexteditor (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3153,7 +3135,7 @@ (define-public ktextwidgets name "-" version ".tar.xz")) (sha256 (base32 - "1609rlwba674kr9whawk93vb1b14b5ly7wvir7kjyjp4j715f47w")))) + "030bz67n6m3fkbldnr48mzicm9cgnr9gdpwipaghl5x5k3s7p1py")))) (build-system qt-build-system) (propagated-inputs (list ki18n sonnet)) @@ -3182,7 +3164,7 @@ (define-public ktextwidgets (define-public kwallet (package (name "kwallet") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3191,10 +3173,10 @@ (define-public kwallet name "-" version ".tar.xz")) (sha256 (base32 - "1ps6ywcirv7xcisvwfcpvk53wm7m8y5lrz4nhkm36rizrdglw19r")))) + "1ra0cxw70vb6pks8sqw5k895rnrfzwxhg6vh4yc5dgzdn1nagb3i")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules kdoctools)) (inputs (list gpgme kauth @@ -3224,7 +3206,7 @@ (define-public kwallet (define-public kxmlgui (package (name "kxmlgui") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3233,7 +3215,7 @@ (define-public kxmlgui name "-" version ".tar.xz")) (sha256 (base32 - "0cvzcq2dcz89c0ffhvfb820hfmqa87mfdbjvrqjwdysc9lr8zx8f")))) + "0hxpjyjr77q2gyi3hg13119aza3634rvmllbj66pi7y37h6lr2z0")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kconfigwidgets)) @@ -3245,6 +3227,7 @@ (define-public kxmlgui kcodecs kcoreaddons kglobalaccel + kguiaddons kiconthemes kitemviews ki18n @@ -3275,16 +3258,16 @@ (define-public kxmlgui (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" + (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 (base32 - "1cmfv2w9yfi8jhj5nawfz7kw8jbr1k5cr3n5xv3z59pg2vazsx8b")))) + "1axy34g5ahd1c3qg7ab7h786jibpaj4dvj45x50x5czq06idqchf")))) (build-system cmake-build-system) (propagated-inputs (list kio)) @@ -3318,7 +3301,7 @@ (define-public kxmlrpcclient (define-public plasma-framework (package (name "plasma-framework") - (version "5.70.1") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3327,13 +3310,12 @@ (define-public plasma-framework name "-" version ".tar.xz")) (sha256 (base32 - "06cxajsxj62g3c37ssrrcaxb9a12zbyp2kvrjqym329k5vd89272")) - (patches (search-patches "plasma-framework-fix-KF5PlasmaMacros.cmake.patch")))) + "1xq66lyagjsgfashhqgqgqhda0rqfqf0l5yf1gc4ziv48mibrhn6")))) (build-system cmake-build-system) (propagated-inputs (list kpackage kservice)) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules kdoctools pkg-config)) (inputs `(("kactivities" ,kactivities) ("karchive" ,karchive) @@ -3355,11 +3337,13 @@ (define-public plasma-framework ("kio" ,kio) ("ki18n" ,ki18n) ("kjobwidgets" ,kjobwidgets) - ("knotificantions" ,knotifications) + ("knotifications" ,knotifications) ("kwayland" ,kwayland) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) + ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd, + ("libglvnd" ,libglvnd) ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) @@ -3368,14 +3352,17 @@ (define-public plasma-framework ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (arguments - `(#:tests? #f ; FIXME: 9/15 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail + (invoke "ctest" "-E" (string-append "(plasma-dialogstatetest" + "|plasma-iconitemtest" + "|plasma-themetest" + "|dialognativetest)"))) #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Libraries, components and tools of Plasma workspaces") @@ -3387,7 +3374,7 @@ (define-public plasma-framework (define-public purpose (package (name "purpose") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3396,7 +3383,7 @@ (define-public purpose name "-" version ".tar.xz")) (sha256 (base32 - "1pxlx2hgj42zsisws8f486n8sg0vn5a5mhb85prifwkaw0rqzgah")))) + "02j09zf18dwjk17mn841m7cm0qsn7gcz5lff8dad3yah0lc3wqcl")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -3412,13 +3399,6 @@ (define-public purpose qtdeclarative)) (arguments `(#:tests? #f ;; seem to require network; don't find QTQuick components - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'dont-use-qt515-logic - (lambda _ - (substitute* "src/externalprocess/purposeprocess_main.cpp" - ((" 15") " 16")) - #t))) #:configure-flags '("-DBUILD_TESTING=OFF"))) ; not run anyway (home-page "https://community.kde.org/Frameworks") (synopsis "Offers available actions for a specific purpose") @@ -3460,7 +3440,7 @@ (define kinit-bootstrap (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) (uri (string-append @@ -3469,7 +3449,7 @@ (define-public kde-frameworkintegration "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1lvccvhhkzdv1hw627kw3ds18gfq4bxdhlvh959piqxq5gh9d2n0")))) + "0pgcwfxxzvfvqyjfgqzsllzfy9il4y8xr8dzdyjmd5vccpvgd3mx")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -3516,7 +3496,7 @@ (define-public kde-frameworkintegration (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3525,15 +3505,17 @@ (define-public kdelibs4support (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0imkibjlfc0jshdzr05fz5dy2xmfhvgsfan9b1r35spwsn5qkawx")))) + (base32 "1q7d0i09klkhsiwq7i91ypxakdr5b841zdb60q7yjzcdmn25wbi9")))) (build-system cmake-build-system) (native-inputs (list dbus docbook-xml-4.4 ; optional extra-cmake-modules + kdoctools perl perl-uri pkg-config + qttools shared-mime-info kjobwidgets ;; required for running the tests strace @@ -3574,7 +3556,6 @@ (define-public kdelibs4support networkmanager-qt openssl qtsvg - qttools qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt @@ -3610,7 +3591,7 @@ (define-public kdelibs4support (lambda _ (display "[testSmb]\n*\n"))) ;; kuniqueapptest hangs. FIXME: Make this test pass. - (invoke "dbus-launch" "ctest" "." + (invoke "dbus-launch" "ctest" "-E" "kstandarddirstest|kuniqueapptest")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 porting aid from KDELibs4") @@ -3632,7 +3613,7 @@ (define-public kdelibs4support (define-public khtml (package (name "khtml") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3641,7 +3622,7 @@ (define-public khtml (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1jh0g6xv57hyclnh54x0f72lby1gvlisan23y7mzlqf67aky52s5")))) + (base32 "06hpjcm5yrfj1056vvv9dklccd0a1y09zm8ch4a5d8l2lfgdg8ci")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules perl)) @@ -3682,7 +3663,7 @@ (define-public khtml (define-public kjs (package (name "kjs") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3691,7 +3672,7 @@ (define-public kjs (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0s3n0pdz59p5v967zrxcas3lb94k5bv9vi8058fi0l20nwwlcgh5")))) + (base32 "067ilsm78x03kf5fs2xmlasvy2712k0xrsa404g2zj81fm92s1q4")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools perl pkg-config)) @@ -3711,7 +3692,7 @@ (define-public kjs (define-public kjsembed (package (name "kjsembed") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3720,7 +3701,7 @@ (define-public kjsembed (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) + (base32 "0db0r8v0bhp3razwyvmvk9r4psl14vgn23c4cm2q1b5pl0w6bhnp")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools qttools)) @@ -3735,7 +3716,7 @@ (define-public kjsembed (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3744,7 +3725,7 @@ (define-public kmediaplayer (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) + (base32 "19lpib2wj91w8shsf9056nwi46qja8nh96hj164ydqlkslpfnf7y")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools qttools)) @@ -3771,7 +3752,7 @@ (define-public kmediaplayer (define-public kross (package (name "kross") - (version "5.70.0") + (version "5.92.0") (source (origin (method url-fetch) @@ -3780,7 +3761,7 @@ (define-public kross (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) + (base32 "1gqy1h5mqsfgbpqkdrhs7xf77kw4yy19mryda1fwjcqzxd02i7hj")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools qttools)) @@ -3813,19 +3794,29 @@ (define-public kross (define-public kdav (package (name "kdav") - (version "20.04.3") + (version "5.92.0") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdav-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn")))) + (base32 "1i5i6bkjairz1slk3fhrxd3s8wkcdaqg55jg2bv86kqh7d3nrcgk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns)) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Seems to require network. + (invoke "ctest" "-E" + "(kdav-davcollectionsmultifetchjobtest|kdav-davitemfetchjob)")) + #t))))) (home-page "https://invent.kde.org/frameworks/kdav") (synopsis "DAV protocol implementation with KJobs") (description "This is a DAV protocol implementation with KJobs. Calendars diff --git a/gnu/packages/patches/kdbusaddons-kinit-file-name.patch b/gnu/packages/patches/kdbusaddons-kinit-file-name.patch deleted file mode 100644 index ffed88e043..0000000000 --- a/gnu/packages/patches/kdbusaddons-kinit-file-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add placeholder for kinit's store file name. - -diff --git a/src/kdeinitinterface.cpp b/src/kdeinitinterface.cpp -index 22fa5e5..3d40937 100644 ---- a/src/kdeinitinterface.cpp -+++ b/src/kdeinitinterface.cpp -@@ -52,7 +52,7 @@ void KDEInitInterface::ensureKdeinitRunning() - // If not found in system paths, search other paths - if (srv.isEmpty()) { - const QStringList searchPaths = QStringList() -- << QCoreApplication::applicationDirPath() // then look where our application binary is located -+ << QString::fromUtf8("@SUBSTITUTEME@/bin") // using QStringLiteral would be more efficient, but breaks guix store reference detection. - << QLibraryInfo::location(QLibraryInfo::BinariesPath); // look where exec path is (can be set in qt.conf) - srv = QStandardPaths::findExecutable(QStringLiteral("kdeinit5"), searchPaths); - if (srv.isEmpty()) { diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch index 1271f3df7d..b27c6ed535 100644 --- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -21,27 +21,6 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch #endif }; #endif -@@ -1533,20 +1531,6 @@ static int initXconnection() - } - #endif - --#ifndef Q_OS_OSX --// Find a shared lib in the lib dir, e.g. libkio.so. --// Completely unrelated to plugins. --static QString findSharedLib(const QString &lib) --{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; -- if (QFile::exists(path)) { -- return path; -- } -- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -- return QString(); --} --#endif -- - extern "C" { - - static void secondary_child_handler(int) @@ -1673,7 +1673,7 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { diff --git a/gnu/packages/patches/kinit-kdeinit-libpath.patch b/gnu/packages/patches/kinit-kdeinit-libpath.patch deleted file mode 100644 index 6382e8804b..0000000000 --- a/gnu/packages/patches/kinit-kdeinit-libpath.patch +++ /dev/null @@ -1,37 +0,0 @@ -Search libraries in GUIX_KF5INIT_LIB_PATH. - -Based on an idea by NixOs -pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch - -=================================================================== ---- kinit-5.32.0/src/kdeinit/kinit.cpp.orig 2017-10-22 21:02:20.908765455 +0200 -+++ kinit-5.32.0/src/kdeinit/kinit.cpp 2017-10-22 21:03:25.312818248 +0200 -@@ -623,20 +623,18 @@ - if (libpath_relative) { - // NB: Because Qt makes the actual dlopen() call, the - // RUNPATH of kdeinit is *not* respected - see - // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 - // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- QString orig_libpath = libpath; -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -- if (!l.load()) { -- libpath = orig_libpath; -- l.setFileName(libpath); -- l.load(); -- } -+ // Try to load the library relative to the active profiles. -+ QByteArrayList profiles = qgetenv("KDEINIT5_LIBRARY_PATH").split(':'); -+ for (const QByteArray &profile: profiles) { -+ if (!profile.isEmpty()) { -+ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/") + libpath); -+ if (l.load()) break; -+ } -+ } - } else { - l.load(); - } - if (!l.isLoaded()) { - QString ltdlError(l.errorString()); diff --git a/gnu/packages/patches/kio-search-smbd-on-PATH.patch b/gnu/packages/patches/kio-search-smbd-on-PATH.patch index 55535ffa11..5118c9a361 100644 --- a/gnu/packages/patches/kio-search-smbd-on-PATH.patch +++ b/gnu/packages/patches/kio-search-smbd-on-PATH.patch @@ -1,30 +1,24 @@ -Adopted from NixOS -pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch +From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Sun, 28 Mar 2021 10:31:12 -0500 +Subject: [PATCH 1/2] Remove impure smbd search path -=================================================================== ---- kio-5.17.0.orig/src/core/ksambashare.cpp -+++ kio-5.17.0/src/core/ksambashare.cpp -@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( - +--- + src/core/ksambashare.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp +index e810ce4..7cfb4e6 100644 +--- a/src/core/ksambashare.cpp ++++ b/src/core/ksambashare.cpp +@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate() bool KSambaSharePrivate::isSambaInstalled() { -- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) -- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { -- return true; -+ const QByteArray pathEnv = qgetenv("PATH"); -+ if (!pathEnv.isEmpty()) { -+ QLatin1Char pathSep(':'); -+ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); -+ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append(QStringLiteral("/smbd")); -+ if (QFile::exists(*it)) { -+ return true; -+ } -+ } + const bool daemonExists = +- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); ++ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); + if (!daemonExists) { + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; } - -- //qDebug() << "Samba is not installed!"; -- - return false; - } - +-- +2.30.1 diff --git a/gnu/packages/patches/kpackage-allow-external-paths.patch b/gnu/packages/patches/kpackage-allow-external-paths.patch deleted file mode 100644 index c1c9efde7f..0000000000 --- a/gnu/packages/patches/kpackage-allow-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 5aec9fd..b15c933 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(nullptr), - metadata(nullptr), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch b/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch deleted file mode 100644 index d677f19a70..0000000000 --- a/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 668010ebc9fd84d9dc60f90b9a4ebf3c7054977f Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel <h.goebel@crazy-compilers.com> -Date: Sun, 25 Oct 2020 20:11:13 +0000 -Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX. - -See <https://bugs.kde.org/424483> for details. ---- - KF5PackageMacros.cmake | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake -index f4c1d1d..acd3798 100644 ---- a/KF5PackageMacros.cmake -+++ b/KF5PackageMacros.cmake -@@ -1,6 +1,5 @@ - --find_package(ECM 1.6.0 CONFIG REQUIRED) --include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) -+include(KDEInstallDirs) - - set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage") - --- -GitLab - diff --git a/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch b/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch deleted file mode 100644 index bd55d512cf..0000000000 --- a/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ff5ed26f21d304e867ab57781878069567deb23d Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel <h.goebel@crazy-compilers.com> -Date: Mon, 3 Aug 2020 19:49:58 +0000 -Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX. - -See <https://bugs.kde.org/424483> for details ---- - KF5PlasmaMacros.cmake | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/KF5PlasmaMacros.cmake b/KF5PlasmaMacros.cmake -index 494b42d56..80b3fd8dd 100644 ---- a/KF5PlasmaMacros.cmake -+++ b/KF5PlasmaMacros.cmake -@@ -1,6 +1,5 @@ - --find_package(ECM 1.6.0 CONFIG REQUIRED) --include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) -+include(KDEInstallDirs) - - set(PLASMA_RELATIVE_DATA_INSTALL_DIR "plasma") - set(PLASMA_DATA_INSTALL_DIR "${KDE_INSTALL_DATADIR}/${PLASMA_RELATIVE_DATA_INSTALL_DIR}") --- -GitLab - -- 2.37.0

[bug#50862,PATCHES] KDE updates (5.90, 22.12.2)

Checks

Commit Message

Patch