From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enSaH-0005DR-Hj for guix-patches@gnu.org; Sun, 18 Feb 2018 12:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1enSaE-0001hI-Bp for guix-patches@gnu.org; Sun, 18 Feb 2018 12:17:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:42151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1enSaE-0001h9-79 for guix-patches@gnu.org; Sun, 18 Feb 2018 12:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1enSaD-0007Y8-V0 for guix-patches@gnu.org; Sun, 18 Feb 2018 12:17:01 -0500 Subject: [bug#30398] [PATCH 1/9] gnu: kde-frameworks: Update to 5.42.0 resp. 5.42.1 Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180208220237.13753-1-h.goebel@crazy-compilers.com> References: <20180208215749.13348-1-h.goebel@crazy-compilers.com> <20180208220237.13753-1-h.goebel@crazy-compilers.com> Date: Sun, 18 Feb 2018 18:16:51 +0100 Message-ID: <878tbqtdz0.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Hartmut Goebel , 30398@debbugs.gnu.org --=-=-= Content-Type: text/plain Hartmut Goebel 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] New > phase. > (extra-cmake-modules): Update to 5.42.0. > [#:phases]: New phase. > (kfilemetadata): Update to 5.42.0. [#:phases]: No longer move check behind > install. [#:phases] Remove. [#:phase] New > phase. > (kimageformats): Update to 5.42.0. [#:phases]: No longer > symlink plugins into ./bin. > (ktesteditor)[source]: Remove patch. > (plasma-framework)[inputs]: Add kirigami > (sonnet): Update to 5.42.0. [#:phases] 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqJtQMACgkQoqBt8qM6 VPrjewgAu4OGNZULa+Krd049TwKdnIxHEZ2ryMFAdaTQdkUnffAzqZ+TmcS6Ea94 fS88zxdyGZQui/JDnPJnvfLg+MtOESmQopQnkcYiK1YTHV5Zm0uCsT0pUws4ZTxO UIV/PyTCTHv6iLCg2L0I4C1U5m03FVJstQbiyAyBgEv4C6YjbObzPf9ctjB1MuWH qDO2tGw8bZb1UVfJsyrUhQj35V6tnwzWopOOECVF+KUj1N7NSLhQ/DOaOBOdrrjx oX9kZv3ZWrvS8XiyDqcckbDB4A+fo7FySk/69QSaoD1qPRLn1eMi5j6kftiQepn+ MvlDzyF6PcpUOK8OGh/VyY8V636r/Q== =Cs5v -----END PGP SIGNATURE----- --=-=-=--