From patchwork Mon Apr 15 12:47:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63029 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 3004F27BBEA; Mon, 15 Apr 2024 13:56:55 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 28BCC27BBEB for ; Mon, 15 Apr 2024 13:56:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLss-0007z5-6Q; Mon, 15 Apr 2024 08:56:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwLsq-0007yF-Bj for guix-patches@gnu.org; Mon, 15 Apr 2024 08:56:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwLsn-0004Hc-Gq for guix-patches@gnu.org; Mon, 15 Apr 2024 08:56:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLsy-0004bJ-TV for guix-patches@gnu.org; Mon, 15 Apr 2024 08:56:36 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 45/63] gnu: Add kconfigwidgets-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:56:36 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70395@debbugs.gnu.org Received: via spool by 70395-submit@debbugs.gnu.org id=B70395.171318575917192 (code B ref 70395); Mon, 15 Apr 2024 12:56:36 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:55:59 +0000 Received: from localhost ([127.0.0.1]:37317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLsM-0004Su-4g for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:55:59 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:42816 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLra-0004IL-5p for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:55:19 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowAAntRIfIh1mwJCuAw--.3695S6; Mon, 15 Apr 2024 20:48:32 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:47:22 +0800 Message-ID: <6c3744c14efc36160e004e4bb37b09af84ce3457.1713184499.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAAntRIfIh1mwJCuAw--.3695S6 X-Coremail-Antispam: 1UD129KBjvJXoWxGw13Gr4fZFWrGrW8XF1UKFg_yoW5tw17pF WrK3s0gr15JF9xJw4SqF10gw15u3s7Wr13Jw4xJ34Ika13J3yxCryIgrZ8Gr1xWrs7Ca4D uF1rKa1UWr45ArDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUgUDGDUUUU X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (kconfigwidgets-6): New variable. (kconfigwidgets): Inherit above. Change-Id: I9d3b4c68f0a11c74f0d1c7c41eb615eb2c1600a2 --- gnu/packages/kde-frameworks.scm | 63 +++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 42d352056f..a2fb4883a3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3214,10 +3214,10 @@ (define-public kcmutils KCModules can be created with the KConfigWidgets framework.") (license license:lgpl2.1+))) -(define-public kconfigwidgets +(define-public kconfigwidgets-6 (package (name "kconfigwidgets") - (version "5.114.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (string-append @@ -3226,21 +3226,21 @@ (define-public kconfigwidgets name "-" version ".tar.xz")) (sha256 (base32 - "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj")))) + "0wfiz6frwmvbjfz30ci2iilzxr1rww7i74mbjigg1xkgg4p2n98b")))) (build-system qt-build-system) (propagated-inputs - (list kauth kcodecs kconfig kwidgetsaddons)) + (list kcodecs-6 kconfig-6 kcolorscheme kwidgetsaddons-6)) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools-6 qttools)) (inputs - (list kcoreaddons - kguiaddons - ki18n + (list kcoreaddons-6 + kguiaddons-6 + ki18n-6 ;; todo: PythonModuleGeneration - qtbase-5 - qttools-5)) + qtdeclarative)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -3254,7 +3254,8 @@ (define-public kconfigwidgets (when tests? (setenv "HOME" (getcwd)) - (invoke "ctest" "-E" "kstandardactiontest"))))))) + (invoke "ctest" "-E" "(kstandardactiontest|\ +klanguagenametest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for configuration dialogs") (description "KConfigWidgets provides easy-to-use classes to create @@ -3263,6 +3264,46 @@ (define-public kconfigwidgets ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kconfigwidgets + (package + (inherit kconfigwidgets-6) + (name "kconfigwidgets") + (version "5.114.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj")))) + (propagated-inputs + (list kauth kcodecs kconfig kwidgetsaddons)) + (native-inputs + (list extra-cmake-modules kdoctools qttools-5)) + (inputs + (list kcoreaddons + kguiaddons + ;; todo: PythonModuleGeneration + ki18n)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/khelpclient.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (invoke "ctest" "-E" "kstandardactiontest"))))))))) + (define-public kdeclarative (package (name "kdeclarative")