diff mbox series

[bug#50862,v3,01/10] gnu: extra-cmake-modules: Update to 5.90.0.

Message ID DSwYELHrcO9c3scdI0y1_5yUBO2jkHFz_S6iKp8bE-ApvRhrCwGacNJFlVWWqYgdZxeHPtmFsTyup85D5I05GDVnz0hEk0zNKbCBfAg41AM=@protonmail.com
State Accepted
Headers show
Series [bug#50862,v3,01/10] gnu: extra-cmake-modules: Update to 5.90.0. | expand

Commit Message

phodina Jan. 28, 2022, 5:47 p.m. UTC 
Hi,

thanks for the patches. I've just started applying them.

However, there has been a merge of core-updates-frozen into master in commit 6dffced09ecda024e0884e352778c221ad066fd6.

Also the syntax for inputs has changed so the patches now fail.

I've been slowly applying them to the latest master as well as updating the package version if needed.

Here are the few I've been through.

----
Petr

Comments

Leo Famulari Jan. 29, 2022, 7:55 p.m. UTC | #1 
On Fri, Jan 28, 2022 at 05:47:57PM +0000, phodina via Guix-patches via wrote:
> Hi,
> 
> thanks for the patches. I've just started applying them.
> 
> However, there has been a merge of core-updates-frozen into master in commit 6dffced09ecda024e0884e352778c221ad066fd6.
> 
> Also the syntax for inputs has changed so the patches now fail.
> 
> I've been slowly applying them to the latest master as well as updating the package version if needed.

That sounds frustrating... thanks for taking it on!

Let us know when the patches are rebased to current master. 

> Here are the few I've been through.
> 
> ----
> Petr

> From ee754bed0b2f310089ee8fa5dc1cdc15446ef050 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 15:48:21 +0100
> Subject: [PATCH v3 01/10] gnu: extra-cmake-modules: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.90.0.
>   [phases]: Respect #:tests?. No need to run check after install anymore.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 65937f8970..85dfa319c8 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -9,6 +9,8 @@
>  ;;; Copyright ?? 2020 Vincent Legoll <vincent.legoll@gmail.com>
>  ;;; Copyright ?? 2020 Marius Bakke <mbakke@fastmail.com>
>  ;;; Copyright ?? 2021 Alexandros Theodotou <alex@zrythm.org>
> +;;; Copyright ?? 2021 Brendan Tildesley <mail@brendan.scot>
> +;;; Copyright ?? 2022 Petr Hodina <phodina@protonmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -87,7 +89,7 @@ (define-module (gnu packages kde-frameworks)
>  (define-public extra-cmake-modules
>    (package
>      (name "extra-cmake-modules")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -96,7 +98,7 @@ (define-public extra-cmake-modules
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
> +                "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k"))))
>      (build-system cmake-build-system)
>      (native-inputs
>       ;; Add test dependency, except on armhf where building it is too
> @@ -131,11 +133,11 @@ (define-public extra-cmake-modules
>                 (("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
>                  "set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))
>               #t))
> -         ;; install and check phase are swapped to prevent install from failing
> -         ;; after testsuire has run
> -         (add-after 'install 'check-post-install
> -           (assoc-ref %standard-phases 'check))
> -         (delete 'check))))
> +         (replace 'check
> +           (lambda* (#:key tests? #:allow-other-keys)
> +             (when tests? ;; This test fails
> +               (invoke "ctest" "-E" "KDEFetchTranslations"))
> +             #t)))))
>      ;; optional dependencies - to save space, we do not add these inputs.
>      ;; Sphinx > 1.2:
>      ;;   Required to build Extra CMake Modules documentation in Qt Help format.
> -- 
> 2.34.0
> 

> From a5a748a3b58ef6f4e0b9c15228021eff98a4f6b4 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 16:03:27 +0100
> Subject: [PATCH v3 03/10] gnu: bluez-qt: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (bluez-qt): Update to 5.90.0.
>   [phases]: Enable tests. They work now.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 1ff7219aed..f6259d0749 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -275,7 +275,7 @@ (define-public attica
>  (define-public bluez-qt
>    (package
>      (name "bluez-qt")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -284,7 +284,7 @@ (define-public bluez-qt
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k"))))
> +                "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3"))))
>      (build-system cmake-build-system)
>      (native-inputs
>       (list dbus extra-cmake-modules))
> @@ -292,12 +292,16 @@ (define-public bluez-qt
>       ;; TODO: qtdeclarative (yields one failing test)
>       (list qtbase-5))
>      (arguments
> -     (list #:configure-flags
> -           #~(list (string-append
> -                    "-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))
> +     `(#:configure-flags
> +           (list (string-append
> +                    "-DUDEV_RULES_INSTALL_DIR=" %output "/lib/udev/rules.d"))
> +           #: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
> -- 
> 2.34.0
> 

> From 2eccec9d24c8bc438f7e83b3c3fca544af5940c5 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 15:51:10 +0100
> Subject: [PATCH v3 02/10] gnu: attica: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (attica): Update to 5.90.0.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 85dfa319c8..1ff7219aed 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -235,7 +235,7 @@ (define-public phonon-backend-gstreamer
>  (define-public attica
>    (package
>      (name "attica")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -244,7 +244,7 @@ (define-public attica
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx"))))
> +                "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk"))))
>      (build-system cmake-build-system)
>      (arguments
>       `(#:phases
> -- 
> 2.34.0
> 

> From 709399e43bdc27307f6e43a80f3909f704951d85 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:09:58 +0100
> Subject: [PATCH v3 04/10] gnu: breeze-icons: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (breeze-icons): Update to 5.90.0.
> * gnu/local.mk: Add patch.
> * gnu/packages/patches/breeze-icons-fix-dupe-tests.patch: New file.
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 27e7877361..b850ed7b61 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -888,6 +888,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/bc-fix-cross-compilation.patch		\
>    %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch		\
>    %D%/packages/patches/bind-re-add-attr-constructor-priority.patch	\
> +  %D%/packages/patches/breeze-icons-fix-dupe-tests.patch \
>    %D%/packages/patches/brightnessctl-elogind-support.patch	\
>    %D%/packages/patches/bsd-games-2.17-64bit.patch		\
>    %D%/packages/patches/bsd-games-add-configure-config.patch	\
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index f6259d0749..dacdcdf0d3 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -311,19 +311,24 @@ (define-public bluez-qt
>  (define-public breeze-icons
>    (package
>      (name "breeze-icons")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
>                      "mirror://kde/stable/frameworks/"
>                      (version-major+minor version) "/"
>                      name "-" version ".tar.xz"))
> +              (patches
> +               ;; TODO: Remove with next update (5.91.0)
> +               (search-patches "breeze-icons-fix-dupe-tests.patch"))
>                (sha256
>                 (base32
> -                "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm"))))
> +                "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn"))))
>      (build-system cmake-build-system)
> +	(arguments
> +	`(#:tests? #f)) ; failing tests https://invent.kde.org/frameworks/breeze-icons/-/issues/7
>      (native-inputs
> -     (list extra-cmake-modules fdupes libxml2))
> +     (list extra-cmake-modules fdupes python-lxml python))
>      (inputs
>       (list qtbase-5))
>      (home-page "https://community.kde.org/Frameworks")
> diff --git a/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch b/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch
> new file mode 100644
> index 0000000000..03f488e90e
> --- /dev/null
> +++ b/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch
> @@ -0,0 +1,166 @@
> +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
> +deleted file mode 100644
> +index eff7ce8601b2bfdf52b9adaa1beec9e347801984..0000000000000000000000000000000000000000
> +--- a/icons/places/16/folder-book.svg
> ++++ /dev/null
> +@@ -1,13 +0,0 @@
> +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
> +-       d="M 3 2 L 3 3 L 3 4 L 2 4 L 2 6 L 3 6 L 3 10 L 2 10 L 2 12 L 3 12 L 3 13.5 L 3 14 L 14 14 L 14 13 L 14 3 L 14 2 L 3 2 z M 4 3 L 5 3 L 5 13 L 4 13 L 4 3 z M 6 3 L 13 3 L 13 13 L 6 13 L 6 3 z "
> +-     class="ColorScheme-Text"
> +-     />
> +-</svg>
> +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..328a27f31fe7f2a46c0ded43b67051ebc4638e52
> +--- /dev/null
> ++++ b/icons/places/16/folder-book.svg
> +@@ -0,0 +1 @@
> ++../../actions/16/address-book-new.svg
> +\ No newline at end of file
> +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
> +deleted file mode 100644
> +index e2f5c9f363d633d23f3b0a63af377d82fbb1103c..0000000000000000000000000000000000000000
> +--- a/icons/places/16/folder-comic.svg
> ++++ /dev/null
> +@@ -1,13 +0,0 @@
> +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
> +-     d="M 5 2 L 5 5 L 2 5 L 2 11 L 5 14 L 5 11 L 10 11 L 10 8 L 11 8 L 11 11 L 14 8 L 14 2 L 5 2 z M 6 3 L 13 3 L 13 7 L 6 7 L 6 3 z M 3 6 L 5 6 L 5 8 L 9 8 L 9 10 L 3 10 L 3 6 z "
> +-     class="ColorScheme-Text"
> +-     />
> +-</svg>
> +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..0725f95054153138ba1278d2b41df2ea3b235b48
> +--- /dev/null
> ++++ b/icons/places/16/folder-comic.svg
> +@@ -0,0 +1 @@
> ++../../actions/16/kmouth-phrasebook.svg
> +\ No newline at end of file
> +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
> +deleted file mode 100644
> +index d78dee94562c85c1e9c115f3d7965ab7092dfc55..0000000000000000000000000000000000000000
> +--- a/icons/places/16/folder-library.svg
> ++++ /dev/null
> +@@ -1,14 +0,0 @@
> +-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +-<path
> +-    d="m8 2.0039062-6 3.8984376v1.0976562h1v6h-1v1h12v-1h-1v-6h1v-1.0976562zm0 1.1933594 4.310547 2.8027344h-8.6210939zm-4 3.8027344h1v6h-1zm2 0h4v6h-1v-2h-2v2h-1zm5 0h1v6h-1z"
> +-    style="fill:currentColor;fill-opacity:1;stroke:none"
> +-    class="ColorScheme-Text"
> +-    />
> +-</svg>
> +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..1ce765dfa2fda283888529fdc5cf966f8dbbdd6f
> +--- /dev/null
> ++++ b/icons/places/16/folder-library.svg
> +@@ -0,0 +1 @@
> ++../../actions/16/view-institution.svg
> +\ No newline at end of file
> +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
> +deleted file mode 100644
> +index d124463e00598055518c8e43a6b505d2fcd16b91..0000000000000000000000000000000000000000
> +--- a/icons/places/22/folder-book.svg
> ++++ /dev/null
> +@@ -1,14 +0,0 @@
> +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +- <path 
> +-     style="fill:currentColor;fill-opacity:1;stroke:none" 
> +-     d="m5 3v1 1h-2v3h2v6h-2v3h2v2h1 13v-1-14-1h-14m1 1h2v14h-2v-14m3 0h9v14h-9v-14"
> +-	 class="ColorScheme-Text"
> +-     />
> +-</svg>
> +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..69db4d5775e03202922f8d620ad6bd755a8f7c89
> +--- /dev/null
> ++++ b/icons/places/22/folder-book.svg
> +@@ -0,0 +1 @@
> ++../../actions/22/address-book-new.svg
> +\ No newline at end of file
> +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
> +deleted file mode 100644
> +index 75c26bc4abf2650b8f7871e39be8e08a0838e76b..0000000000000000000000000000000000000000
> +--- a/icons/places/22/folder-comic.svg
> ++++ /dev/null
> +@@ -1,14 +0,0 @@
> +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +- <path 
> +-     style="fill:currentColor;fill-opacity:1;stroke:none" 
> +-     d="M 7 4 L 7 7 L 3 7 L 3 15 L 6 18 L 6 15 L 15 15 L 15 12 L 16 12 L 16 15 L 19 12 L 19 4 L 7 4 z M 8 5 L 18 5 L 18 11 L 15 11 L 14 11 L 8 11 L 8 8 L 8 7 L 8 5 z M 4 8 L 7 8 L 7 12 L 14 12 L 14 14 L 4 14 L 4 8 z "
> +-     class="ColorScheme-Text"
> +-     />
> +-</svg>
> +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..097a5a84794498b7e35459c5ae5833ae29e39ccf
> +--- /dev/null
> ++++ b/icons/places/22/folder-comic.svg
> +@@ -0,0 +1 @@
> ++../../actions/22/kmouth-phrasebook.svg
> +\ No newline at end of file
> +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
> +deleted file mode 100644
> +index d62c7ddf8340e89671fe140afbb6cf65ea4aa54a..0000000000000000000000000000000000000000
> +--- a/icons/places/22/folder-library.svg
> ++++ /dev/null
> +@@ -1,14 +0,0 @@
> +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
> +-  <defs id="defs3051">
> +-    <style type="text/css" id="current-color-scheme">
> +-      .ColorScheme-Text {
> +-        color:#232629;
> +-      }
> +-      </style>
> +-  </defs>
> +- <path 
> +-    style="fill:currentColor;fill-opacity:1;stroke:none" 
> +-    d="M 11 3 L 3 7.6230469 L 3 7.9980469 L 3 9 L 4 9 L 4 10 L 4 18 L 3 18 L 3 19 L 19 19 L 19 18 L 18 18 L 18 10 L 18 9 L 19 9 L 19 7.9980469 L 19 7.6230469 L 11 3 z M 11 4.15625 L 17.650391 7.9980469 L 4.3496094 7.9980469 L 11 4.15625 z M 5 9 L 7 9 L 7 10 L 7 18 L 5 18 L 5 10 L 5 9 z M 8 9 L 14 9 L 14 10 L 14 18 L 13 18 L 13 14 L 9 14 L 9 18 L 8 18 L 8 10 L 8 9 z M 15 9 L 17 9 L 17 10 L 17 18 L 15 18 L 15 10 L 15 9 z "
> +-	class="ColorScheme-Text"
> +-    />  
> +-</svg>
> +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
> +new file mode 120000
> +index 0000000000000000000000000000000000000000..d95f23aa116a635296a9d61b9c6d3b933f7478e9
> +--- /dev/null
> ++++ b/icons/places/22/folder-library.svg
> +@@ -0,0 +1 @@
> ++../../actions/22/view-institution.svg
> +\ No newline at end of file
> -- 
> 2.34.0
> 

> From adb19906a6b5569f9df0d3283d465f14cc7b058a Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:14:02 +0100
> Subject: [PATCH v3 05/10] gnu: kapidox: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (kapidox): Update to 5.90.0.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index dacdcdf0d3..d76dd7e193 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -343,7 +343,7 @@ (define-public breeze-icons
>  (define-public kapidox
>    (package
>      (name "kapidox")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -352,12 +352,11 @@ (define-public kapidox
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j"))))
> +                "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p"))))
>      (build-system cmake-build-system)
>      (arguments
> -     `(#:tests? #f)) ; has no test target
> -    (native-inputs
> -     (list extra-cmake-modules))
> +     `(#:tests? #f  ; has no test target
> +       #:make-flags (list "DESTDIR=/"))) ;; Otherwise it doesn't install anything.
>      (propagated-inputs
>       ;; kapidox is a python programm
>       ;; TODO: check if doxygen has to be installed, the readme does not
> -- 
> 2.34.0
> 

> From e79fbe37b8d9aac70f93080e899caf8211386ed0 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:29:13 +0100
> Subject: [PATCH v3 07/10] gnu: kcalendarcore: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (kcalendarcore): Update to 5.90.0.
>   [arguments]: Create dir in '/tmp' and set it to XDG_RUNTIME_DIR.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index a7c6cb1b1a..1a3d722848 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -413,7 +413,7 @@ (define-public karchive
>  (define-public kcalendarcore
>    (package
>      (name "kcalendarcore")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -422,35 +422,23 @@ (define-public kcalendarcore
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2"))))
> +                "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w"))))
>      (build-system cmake-build-system)
>      (native-inputs
>       (list extra-cmake-modules perl tzdata-for-tests))
>      (inputs
>       (list libical qtbase-5))
>      (arguments
> -     `(#:phases
> +     `(#:tests? #f ; testdateserialization fails
> +       ;; https://invent.kde.org/frameworks/kcalendarcore/-/issues/2
> +       #: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
> +         (add-before 'check 'check-setup
>             (lambda* (#:key inputs #:allow-other-keys)
> +             ;; setenv for testdateserialization
> +			 (mkdir-p "/tmp/runtime")
> +             (setenv "XDG_RUNTIME_DIR" "/tmp/runtime")
> +             (setenv "QT_QPA_PLATFORM" "offscreen")
>               (setenv "TZ" "Europe/Prague")
>               (setenv "TZDIR"
>                       (search-input-directory inputs
> -- 
> 2.34.0
> 

> From f523507fd5bcec3c4207796eb668bc23b98af348 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:32:07 +0100
> Subject: [PATCH v3 08/10] gnu: kcodecs: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (kcodecs): Update to 5.90.0.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 1a3d722848..82045cc31c 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -458,7 +458,7 @@ (define-public kcalendarcore
>  (define-public kcodecs
>    (package
>      (name "kcodecs")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -467,7 +467,7 @@ (define-public kcodecs
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk"))))
> +                "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh"))))
>      (build-system cmake-build-system)
>      (native-inputs
>       (list extra-cmake-modules gperf qttools))
> -- 
> 2.34.0
> 

> From 4810be7f81212617e0224bbd10c21bd6e2fbb828 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 18:26:32 +0100
> Subject: [PATCH v3 10/10] gnu: kcoreaddons: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.90.0.
> [arguments]: Enable benchNotifyWatcher tests since it seems to work.
> [native-inputs]: Remove xorg-server-for-tests. Doesn't seem to be used.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index ed2e03c198..993ed73acf 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -556,7 +556,7 @@ (define-public kconfig
>  (define-public kcoreaddons
>    (package
>      (name "kcoreaddons")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -565,12 +565,11 @@ (define-public kcoreaddons
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps"))))
> +                "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf"))))
>      (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
> @@ -583,16 +582,7 @@ (define-public kcoreaddons
>                 (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();")))
> +                 (display "[test_channels]\n*\n")))
>               #t))
>           (add-before 'check 'check-setup
>             (lambda _
> -- 
> 2.34.0
> 

> From a79f103129b28a883772f0eb44ff22bd1e295c28 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:16:54 +0100
> Subject: [PATCH v3 06/10] gnu: karchive: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (karchive): Update to 5.90.0.
>   [native-inputs]: Add pkg-config.
>   [inputs]: Add zstd.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index d76dd7e193..a7c6cb1b1a 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -382,7 +382,7 @@ (define-public kapidox
>  (define-public karchive
>    (package
>      (name "karchive")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -391,12 +391,12 @@ (define-public karchive
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm"))))
> +                "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6"))))
>      (build-system cmake-build-system)
>      (native-inputs
> -     (list extra-cmake-modules))
> +     (list extra-cmake-modules pkg-config)) ; for zstd
>      (inputs
> -     (list bzip2 qtbase-5 xz zlib))
> +     (list bzip2 qtbase-5 xz zlib 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
> -- 
> 2.34.0
> 

> From 3c85ff4f58ddb29affce783cb953a22178d7ac01 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Fri, 28 Jan 2022 17:36:19 +0100
> Subject: [PATCH v3 09/10] gnu: kconfig: Update to 5.90.0.
> 
> * gnu/packages/kde-frameworks.scm (kconfig): Update to 5.90.0.
>   [native-inputs]: Remove apparently unneeded inputs.
>   [arguments]: Disable failing test: kconfigcore-kconfigtest.
> set QT_QPA_PLATFORM=offscreen for tests.
> 
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 82045cc31c..ed2e03c198 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -492,7 +492,7 @@ (define-public kcodecs
>  (define-public kconfig
>    (package
>      (name "kconfig")
> -    (version "5.70.0")
> +    (version "5.90.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -501,11 +501,10 @@ (define-public kconfig
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n"))))
> +                "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"))))
>      (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
> @@ -517,9 +516,12 @@ (define-public kconfig
>               (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" "."))
> +             #t)))))
>      (home-page "https://community.kde.org/Frameworks")
>      (synopsis "Kconfiguration settings framework for Qt")
>      (description "KConfig provides an advanced configuration system.
> -- 
> 2.34.0
>
Leo Famulari Jan. 29, 2022, 7:58 p.m. UTC | #2 
On Sat, Jan 29, 2022 at 02:55:21PM -0500, Leo Famulari wrote:
> Let us know when the patches are rebased to current master. 

Oops, I meant to write more in my message...

Once the patches have been rebased, I think we could probably handle
these updates on a 'kde-updates' Cuirass job, rather than going through
staging or core-updates. So, it shouldn't be delayed for much longer.

As part of that, I'd like to try removing QtWebKit from the KDE packages
entirely:

https://issues.guix.gnu.org/53289
diff mbox series

Patch

From 3c85ff4f58ddb29affce783cb953a22178d7ac01 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:36:19 +0100
Subject: [PATCH v3 09/10] gnu: kconfig: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kconfig): Update to 5.90.0.
  [native-inputs]: Remove apparently unneeded inputs.
  [arguments]: Disable failing test: kconfigcore-kconfigtest.
set QT_QPA_PLATFORM=offscreen for tests.

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 82045cc31c..ed2e03c198 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -492,7 +492,7 @@  (define-public kcodecs
 (define-public kconfig
   (package
     (name "kconfig")
-    (version "5.70.0")
+    (version "5.90.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -501,11 +501,10 @@  (define-public kconfig
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n"))))
+                "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"))))
     (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
@@ -517,9 +516,12 @@  (define-public kconfig
              (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" "."))
+             #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Kconfiguration settings framework for Qt")
     (description "KConfig provides an advanced configuration system.
-- 
2.34.0