From patchwork Mon Apr 15 12:47:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63012 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 43C1227BBEB; Mon, 15 Apr 2024 13:52:49 +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 AFEE127BBE9 for ; Mon, 15 Apr 2024 13:52:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLp9-00051a-Ly; Mon, 15 Apr 2024 08:52:39 -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 1rwLnx-0004B2-29 for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:26 -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 1rwLnw-00030t-PZ for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLo8-0003hE-C6 for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:36 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 47/63] gnu: Add kservice-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:51: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.171318549014126 (code B ref 70395); Mon, 15 Apr 2024 12:51:36 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:51:30 +0000 Received: from localhost ([127.0.0.1]:37241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLnx-0003et-Vy for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:51:29 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:41868 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLlV-00036v-1S for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:49:07 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowAAntRIfIh1mwJCuAw--.3695S8; Mon, 15 Apr 2024 20:48:33 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:47:24 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAAntRIfIh1mwJCuAw--.3695S8 X-Coremail-Antispam: 1UD129KBjvJXoWxJF1xGFWkWw4DAF4DCw4xtFb_yoWrWr1Upr WrKFn0vr15t347Gw4fZ3WUG345Wa95JrWYywsxJ342yw4ayrWI9rySqrWFkF47Grs7Aa4j ka1fK3WUWr15JrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUgBMNUUUUU 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 (kservice-6): New variable. (kservice): Inherit above. Change-Id: I5fe5002627aa0b11b570cc2bbcd9d5380121ecba --- gnu/packages/kde-frameworks.scm | 68 ++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3e22b54c3c..261dc45f11 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -4072,8 +4072,66 @@ (define-public krunner typed.") (license license:lgpl2.1+))) +(define-public kservice-6 + (package + (name "kservice") + (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 + "10g7bj5ks5dbrjbd4ky71jdz54k7s6h91y3n124mayf4wbyyfbpf")))) + (build-system cmake-build-system) + (propagated-inputs + (list kconfig-6 kcoreaddons-6 kdoctools-6)) + (native-inputs + (list bison extra-cmake-modules flex shared-mime-info)) + (inputs + (list kcrash-6 kdbusaddons-6 kdoctools-6 ki18n-6 qtbase qtdeclarative)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")))) + (add-before 'check 'check-setup + (lambda _ + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) (display (string-append "[" name "]\n*\n"))) + (list "extraFileInFutureShouldRebuildSycocaOnce" + "testNonReadableSycoca")))) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "HOME" (getcwd)) + ;; Make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Plugin framework for desktop services") + (description "KService provides a plugin framework for handling desktop +services. Services can be applications or libraries. They can be bound to MIME +types or handled by application specific code.") + ;; triple licensed + (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) + (define-public kservice (package + (inherit kservice-6) (name "kservice") (version "5.114.0") (source (origin @@ -4085,7 +4143,6 @@ (define-public kservice (sha256 (base32 "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca")))) - (build-system cmake-build-system) (propagated-inputs (list kconfig kcoreaddons kdoctools)) (native-inputs @@ -4114,14 +4171,7 @@ (define-public kservice (setenv "HOME" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") ;; Disable failing tests. - (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Plugin framework for desktop services") - (description "KService provides a plugin framework for handling desktop -services. Services can be applications or libraries. They can be bound to MIME -types or handled by application specific code.") - ;; triple licensed - (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) + (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))))) (define-public ktexteditor (package