From patchwork Mon Apr 15 12:47:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63037 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 7584527BBEB; Mon, 15 Apr 2024 14:08:45 +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 96B6427BBE9 for ; Mon, 15 Apr 2024 14:08:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwM3w-000320-J8; Mon, 15 Apr 2024 09:07:56 -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 1rwM3t-00031g-R0 for guix-patches@gnu.org; Mon, 15 Apr 2024 09:07:53 -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 1rwM3t-0007EP-II for guix-patches@gnu.org; Mon, 15 Apr 2024 09:07:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwM45-0006Pz-6A for guix-patches@gnu.org; Mon, 15 Apr 2024 09:08:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 34/63] gnu: Add kpackage-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 13:08:05 +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.171318645724389 (code B ref 70395); Mon, 15 Apr 2024 13:08:05 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 13:07:37 +0000 Received: from localhost ([127.0.0.1]:37359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwM3U-0006JV-7F for submit@debbugs.gnu.org; Mon, 15 Apr 2024 09:07:36 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:44588 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwM3D-0006FG-P4 for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 09:07:27 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowAB3fuYZIh1mrI+uAw--.18104S5; Mon, 15 Apr 2024 20:48:26 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:47:11 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAB3fuYZIh1mrI+uAw--.18104S5 X-Coremail-Antispam: 1UD129KBjvJXoWxAw4UZF1xuFWfGFWUJFWDurg_yoW5uw13pr yfKFWa9r4rK3WfJa1Sqr4xCw15Wws5CF1Y9w47Jw1UKr13KrW8CryIyFWrGF13GF4fC3W2 9a1j9F4UWayUtrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU92b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I 8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCF s4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4 IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1r MI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JV W7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j 6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYx BIdaVFxhVjvjDU0xZFpf9x07bePfdUUUUU= 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 (kpackage-6): New variable. (kpackage): Inherit above. Change-Id: Ie0a0c6a5ad24280b386f5480f8fb0761950b157d --- gnu/packages/kde-frameworks.scm | 58 ++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5801e14a06..1cc402c8f9 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2730,8 +2730,56 @@ (define-public knotifications (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "ctest"))))))))) +(define-public kpackage-6 + (package + (name "kpackage") + (version "6.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1bsjdc8m31yj7ahxx8fdazhrgcchwlqyxvfvmkws903584mr2xgd")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules)) + (propagated-inputs (list kcoreaddons-6)) + (inputs + (list karchive-6 + kconfig-6 + kdoctools-6 + ki18n-6 + qtbase)) + (arguments + (list + ;; The `plasma-querytest' test is known to fail when tests are run in parallel: + ;; + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpackage/package.cpp" + (("bool externalPaths = false;") + "bool externalPaths = true;")) + (substitute* '("src/kpackage/packageloader.cpp") + (("QDirIterator::Subdirectories") + "QDirIterator::Subdirectories | QDirIterator::FollowSymlinks")))) + (add-before 'check 'check-setup + (lambda _ (setenv "HOME" (getcwd))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Installation and loading of additional content as packages") + (description "The Package framework lets the user install and load packages +of non binary content such as scripted extensions or graphic assets, as if they +were traditional plugins.") + (license (list license:gpl2+ license:lgpl2.1+)))) + (define-public kpackage (package + (inherit kpackage-6) (name "kpackage") (version "5.114.0") (source (origin @@ -2743,7 +2791,6 @@ (define-public kpackage (sha256 (base32 "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d")))) - (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs @@ -2753,6 +2800,7 @@ (define-public kpackage kdoctools ki18n qtbase-5)) + (propagated-inputs '()) (arguments (list #:phases @@ -2790,13 +2838,7 @@ (define-public kpackage "")))) (add-before 'check 'check-setup (lambda _ - (setenv "HOME" (getcwd))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Installation and loading of additional content as packages") - (description "The Package framework lets the user install and load packages -of non binary content such as scripted extensions or graphic assets, as if they -were traditional plugins.") - (license (list license:gpl2+ license:lgpl2.1+)))) + (setenv "HOME" (getcwd))))))))) (define-public kpty-6 (package