Subject: [bug#30398] [PATCH 1/9] gnu: kde-frameworks: Update to 5.42.0 resp. 5.42.1

From: Marius Bakke <[email-masked]>
Date: Sun, 18 Feb 2018 18:16:51 +0100

Hartmut Goebel <[email-masked]> writes:

> Beside simple updating:
> - Change all todo-comments for test-cases into "fixme" comments to make them
>   easier to find.
> - breeze-icons: Blacklist a test failing at build.kde.org, too.
> - extra-cmake-modules: Patch out a vanised test-case.
> - kfilemetadata: Can now run the test-suite uninstalled. Blacklist a failing
>   test-case.
> - kimageformats: No longer symlink plugins into ./bin for testing.
> - ktexteditor: Remove now unused patch.
> - plasma-framework: Add input kirigami
> - sonnet: For testing set QT_QPA_PLATFORM=offscreen.
>
> * gnu/packages/kde-frameworks.scm (attica, baloo, bluez-qt, kactivities,
>   kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs,
>   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons,
>   kde-frameworkintegration, kdeclarative, kded, kdelibs4support,
>   kdesignerplugin, kdesu, kdewebkit, kdnssd, kdoctools, kemoticons,
>   kglobalaccel, kguiaddons, khtml, ki18n, kiconthemes, kidletime, kinit, kio,
>   kirigami, kitemmodels, kitemviews, kjobwidgets, kjs, kjsembed, kmediaplayer,
>   knewstuff, knotifications, knotifyconfig, kpackage, kparts, kpeople,
>   kplotting, kpty, kross, krunner, kservice, ksyntaxhighlighting,
>   ktextwidgets, kunitconversion, kwallet, kwayland, kwindowsystem, kxmlgui,
>   kxmlrpcclient, modemmanager-qt, networkmanager-qt, oxygen-icons,
>   prison, solid, threadweaver): Update to 5.42.0.
>   (kwidgetsaddons): Update to 5.42.1.
>   (breeze-icons): Update to 5.42.0. [#:phases]<disable-failing-test> New
>   phase.
>   (extra-cmake-modules): Update to 5.42.0.
>   [#:phases]<post-5.42.0-release-fix>: New phase.
>   (kfilemetadata): Update to 5.42.0. [#:phases]: No longer move check behind
>   install. [#:phases]<check-setup> Remove. [#:phase]<disable-failing-test> New
>   phase.
>   (kimageformats): Update to 5.42.0. [#:phases]<check-setup>: No longer
>   symlink plugins into ./bin.
>   (ktesteditor)[source]: Remove patch.
>   (plasma-framework)[inputs]: Add  kirigami
>   (sonnet): Update to 5.42.0. [#:phases]<check-setup> New phase.
> * gnu/packages/patches/ktexteditor-5.39.0-autotests-dependencies.patch:
>   Remove file.
> * gnu/local.mk (dist_patch_DATA): Remove it.

Wow, thanks for this!

[...]

> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 946c7511a..3642a866e 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -74,7 +74,7 @@
>  (define-public extra-cmake-modules
>    (package
>      (name "extra-cmake-modules")
> -    (version "5.39.0")
> +    (version "5.42.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -83,13 +83,20 @@
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq"))))
> +                "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3"))))
>      (build-system cmake-build-system)
>      (native-inputs
>       `(("qtbase" ,qtbase))) ; For tests (needs qmake)
>      (arguments
>       `(#:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'post-5.42.0-release-fix
> +           ;; FIXME: Remove for > 5.42.0
> +           ;; ECMToolchainAndroidTest doesn't exist anymore
> +           ;; https://cgit.kde.org/extra-cmake-modules.git/commit?id=30f31c46d8caf4
> +           (lambda _
> +             (substitute* "tests/CMakeLists.txt"
> +               (("^add_test_macro\\(ECMToolchainAndroidTest dummy\\)") ""))))

                #t))

[...]

> @@ -1333,8 +1351,16 @@ system.")
>                      name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1"))))
> +                "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw"))))
>      (build-system cmake-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'check 'check-setup
> +           (lambda* (#:key inputs #:allow-other-keys)

Just (lambda _ ...) is sufficient here.

The rest LGTM.

Side note: I think it's okay to push these changes directly instead of
going through the list as long as you are confident that they are
correct and everything builds.