From patchwork Mon May 2 14:30:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 39062 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5D5E727BBE9; Mon, 2 May 2022 15:33:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF25627BBEA for ; Mon, 2 May 2022 15:33:13 +0100 (BST) Received: from localhost ([::1]:33990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlX6u-0004Et-QY for patchwork@mira.cbaines.net; Mon, 02 May 2022 10:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlX6k-0004Dx-Tn for guix-patches@gnu.org; Mon, 02 May 2022 10:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlX6k-00021A-LH for guix-patches@gnu.org; Mon, 02 May 2022 10:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlX6k-00054T-Gx for guix-patches@gnu.org; Mon, 02 May 2022 10:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55222] [PATCH][staging]: gnu: extra-cmake-modules: Update to 5.91.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55222 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55222@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165150192419425 (code B ref -1); Mon, 02 May 2022 14:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2022 14:32:04 +0000 Received: from localhost ([127.0.0.1]:37644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlX5n-00053E-Q9 for submit@debbugs.gnu.org; Mon, 02 May 2022 10:32:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:43034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlX5l-00052o-EL for submit@debbugs.gnu.org; Mon, 02 May 2022 10:32:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlX5l-000404-8d for guix-patches@gnu.org; Mon, 02 May 2022 10:32:01 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:6889) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlX5f-0001vD-8O for guix-patches@gnu.org; Mon, 02 May 2022 10:31:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=LH5Or 8sbiecLLlgj+1KMnU3gHGnDwaSWZeJkRrL+fog=; b=YPJ7NcE0RUDdIV3l6pJ/c IWm2qM9vEwXj5XZw1fjbiJY8DTMkDI3zrVyxC+0rNnzUgycDsQyBcdqVWTXcvTLr VYF9eqHGzudD7Pwmu/kZsNtp6Ja3vnNy/anlxjxrKKVnmkyvkY+zmg+WlIog/ma7 ZWL2jSCvXFHTH0bybiBTcM= Received: from asus-laptop (unknown [163.125.202.16]) by smtp5 (Coremail) with SMTP id HdxpCgBX3SpQ629iIlD+AQ--.23605S2; Mon, 02 May 2022 22:31:45 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Mon, 02 May 2022 22:30:09 +0800 Message-ID: <864k283t0w.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HdxpCgBX3SpQ629iIlD+AQ--.23605S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUnDGODUUUU X-Originating-IP: [163.125.202.16] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLxH0r2HmmW+TMQAAs2 Received-SPF: pass client-ip=123.126.97.5; envelope-from=all_but_last@163.com; helo=mail-m975.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From ff17ceca02f40ddcc737eb2753f60828890e1404 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 2 May 2022 22:25:01 +0800 Subject: [PATCH] gnu: extra-cmake-modules: Update to 5.91.0. * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.91.0. Fix the indentation. [native-inputs]: Use label-less input style. [arguments]: Use G-expresssions. : In phase 'fix-lib-path', use QT_MAJOR_VERSION to determine the installation path, Fix the compatibility with different Qt version. Add phase 'fix-test' to workaround with the broken KDEFetchTranslations test. --- gnu/packages/kde-frameworks.scm | 119 ++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e914499541..6f29d09eaa 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -85,72 +85,89 @@ (define-module (gnu packages kde-frameworks) #:use-module (srfi srfi-1)) (define-public extra-cmake-modules - (package - (name "extra-cmake-modules") - (version "5.70.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3")))) - (build-system cmake-build-system) - (native-inputs - ;; Add test dependency, except on armhf where building it is too - ;; expensive. - (if (and (not (%current-target-system)) - (string=? (%current-system) "armhf-linux")) - '() - `(("qtbase" ,qtbase-5)))) ;for tests (needs qmake) - (arguments - `(#:tests? ,(and (not (%current-target-system)) - (not (null? (package-native-inputs this-package)))) - #:phases - (modify-phases %standard-phases + (package + (name "extra-cmake-modules") + (version "5.91.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + (build-system cmake-build-system) + (native-inputs + ;; Add test dependency, except on armhf where building it is too + ;; expensive. + (if (and (not (%current-target-system)) + (string=? (%current-system) "armhf-linux")) + '() + (list qtbase-5))) ;for tests (needs qmake) + (arguments + (list + #:tests? (and (not (%current-target-system)) + (not (null? (package-native-inputs this-package)))) + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'fix-lib-path (lambda _ ;; Always install into /lib and not into /lib64. - (substitute* "kde-modules/KDEInstallDirs.cmake" - (("\"lib64\"") "\"lib\"") - ;; TODO: Base the following on values taken from Qt - ;; Install plugins into lib/qt5/plugins - ;; TODO: Check if this is okay for Android, too - ;; (see comment in KDEInstallDirs.cmake) + (substitute* "kde-modules/KDEInstallDirsCommon.cmake" + (("\"lib64\"") "\"lib\"")) + + ;; Determine the install path by the major version of Qt. + ;; TODO: Base the following on values taken from Qt + ;; Install plugins into lib/qt5/plugins + ;; TODO: Check if this is okay for Android, too + ;; (see comment in KDEInstallDirs.cmake) + (substitute* '("kde-modules/KDEInstallDirs5.cmake" + "kde-modules/KDEInstallDirs6.cmake") + ;; Fix the installation path of Qt plugins. (("_define_relative\\(QTPLUGINDIR \"\\$\\{_pluginsDirParent}\" \"plugins\"") - "_define_relative(QTPLUGINDIR \"${_pluginsDirParent}\" \"qt5/plugins\"") - ;; Install imports into lib/qt5/imports - (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"") - "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"") - ;; Install qml-files into lib/qt5/qml + "_define_relative(QTPLUGINDIR \"${_pluginsDirParent}\" \"qt${QT_MAJOR_VERSION}/plugins\"") + ;; Fix the installation path of QML files. (("_define_relative\\(QMLDIR LIBDIR \"qml\"") - "_define_relative(QMLDIR LIBDIR \"qt5/qml\"")) + "_define_relative(QMLDIR LIBDIR \"qt${QT_MAJOR_VERSION}/qml\"")) + + ;; Qt Quick Control 1 is no longer available in Qt 6. + (substitute* '("kde-modules/KDEInstallDirs5.cmake") + (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"") + "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")) + (substitute* "modules/ECMGeneratePriFile.cmake" - ;; Install pri-files into lib/qt5/mkspecs + ;; Install pri-files into lib/qt${QT_MAJOR_VERSION}/mkspecs (("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules") - "set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules")) + "set(ECM_MKSPECS_INSTALL_DIR lib/qt${QT_MAJOR_VERSION}/mkspecs/modules")) #t)) + ;; Work around for the failed test KDEFetchTranslations. + ;; It complains that the cmake project name is not + ;; "frameworks/extra-cmake-modules". + ;; TODO: Fix it upstream. + (add-after 'unpack 'fix-test + (lambda _ + (substitute* "tests/KDEFetchTranslations/CMakeLists.txt" + (("frameworks/extra-cmake-modules") "extra-cmake-modules")))) ;; 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)))) - ;; 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. - ;; Qt5LinguistTools , Qt5 linguist tools. , - ;; Required to run tests for the ECMPoQmTools module. - ;; Qt5Core - ;; Required to run tests for the ECMQtDeclareLoggingCategory module, - ;; and for some tests of the KDEInstallDirs module. - (home-page "https://community.kde.org/Frameworks") - (synopsis "CMake module files for common software used by KDE") - (description "The Extra CMake Modules package, or ECM, adds to the + ;; 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. + ;; Qt5LinguistTools , Qt5 linguist tools. , + ;; Required to run tests for the ECMPoQmTools module. + ;; Qt5Core + ;; Required to run tests for the ECMQtDeclareLoggingCategory module, + ;; and for some tests of the KDEInstallDirs module. + (home-page "https://community.kde.org/Frameworks") + (synopsis "CMake module files for common software used by KDE") + (description "The Extra CMake Modules package, or ECM, adds to the modules provided by CMake to find common software. In addition, it provides common build settings used in software produced by the KDE community.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public phonon (package -- 2.36.0