From patchwork Mon Apr 15 12:46:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63042 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 4CB4127BBEB; Mon, 15 Apr 2024 14:08:57 +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 8410527BBEA for ; Mon, 15 Apr 2024 14:08:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwM4D-00037J-I2; Mon, 15 Apr 2024 09:08:13 -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 1rwM4B-00036q-QV for guix-patches@gnu.org; Mon, 15 Apr 2024 09:08:11 -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 1rwM4B-0007K5-Gn for guix-patches@gnu.org; Mon, 15 Apr 2024 09:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwM4M-0006UE-TX for guix-patches@gnu.org; Mon, 15 Apr 2024 09:08:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 15/63] gnu: Add kconfig-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 13:08:22 +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.171318649224794 (code B ref 70395); Mon, 15 Apr 2024 13:08:22 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 13:08:12 +0000 Received: from localhost ([127.0.0.1]:37377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwM48-0006Qp-26 for submit@debbugs.gnu.org; Mon, 15 Apr 2024 09:08:12 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:44592 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwM3D-0006FR-Q0 for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 09:07:36 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowAC3vAAMIh1mxI2uAw--.19175S6; Mon, 15 Apr 2024 20:48:13 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:46:52 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAC3vAAMIh1mxI2uAw--.19175S6 X-Coremail-Antispam: 1UD129KBjvJXoWxJFWUCw1rCryruFW3Jw17Awb_yoWrJF4xpr WSya4agw15GF95Ja9aqr18W345Wwn7Gr47uw47A3srtw4YyrW8Cry7KrZ3Gr17J397Za4j 9ayFgF4a9rW5JrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Sb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07bepBfUUUUU= 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 (kconfig-6): New variable. (kconfig): Inherit above. Change-Id: Ib806189b63ce5f9c47cdf44a5fec810f9e99f347 --- gnu/packages/kde-frameworks.scm | 74 +++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f5448b91e8..768c6b8f00 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -640,10 +640,10 @@ (define-public kcolorpicker which can be used to add custom colors to the popup menu.") (license license:lgpl3+))) -(define-public kconfig +(define-public kconfig-6 (package (name "kconfig") - (version "5.114.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (string-append @@ -652,23 +652,31 @@ (define-public kconfig name "-" version ".tar.xz")) (sha256 (base32 - "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2")))) - (build-system cmake-build-system) + "1xyadln77aa4xn9qh85f5hsvyaf2nm292qiz1ykn0lmcpqjmznig")))) + (build-system qt-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools-5 - xorg-server-for-tests)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (list dbus extra-cmake-modules inetutils qttools)) + (propagated-inputs (list qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (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|\ -kconfiggui-kstandardshortcutwatchertest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list "testNotifyIllegalObjectPath" + "testLocalDeletion" + "testNotify" + "testSignal" + "testDataUpdated")))) + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -700,6 +708,38 @@ (define-public kconfig license:lgpl3+ license:gpl1 ; licende:mit-olif license:bsd-2 license:bsd-3)))) +(define-public kconfig + (package + (inherit kconfig-6) + (name "kconfig") + (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 + "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2")))) + (build-system cmake-build-system) + (native-inputs + (list dbus extra-cmake-modules inetutils qttools-5 + xorg-server-for-tests)) + (inputs + (list qtbase-5 qtdeclarative-5)) + (propagated-inputs '()) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (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|\ +kconfiggui-kstandardshortcutwatchertest)"))))))))) + (define-public kcoreaddons-6 (package (name "kcoreaddons")