From patchwork Mon Apr 15 12:46:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63019 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 9195327BBEB; Mon, 15 Apr 2024 13:53:20 +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 A78DA27BBE9 for ; Mon, 15 Apr 2024 13:53:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLpR-0005Vd-0F; Mon, 15 Apr 2024 08:52:57 -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 1rwLn1-0003YU-HG for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:29 -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 1rwLmx-0002oM-Cd for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLn8-0003Tr-PV for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:34 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 17/63] gnu: Add ksyntaxhighlighting-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:50:34 +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.171318539212874 (code B ref 70395); Mon, 15 Apr 2024 12:50:34 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:49:52 +0000 Received: from localhost ([127.0.0.1]:37193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLmR-0003LJ-AO for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:49:52 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:41776 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLlD-00032a-Jt for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:48:48 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowAC3vAAMIh1mxI2uAw--.19175S8; Mon, 15 Apr 2024 20:48:14 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:46:54 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAC3vAAMIh1mxI2uAw--.19175S8 X-Coremail-Antispam: 1UD129KBjvJXoWxCr13Aw18Ar1fAF4DGrWxJFb_yoW5KF43p3 yfAaySgr1rWw4rJanaqr47uw15Wa1fCFnFyws3J3y8Ww4Yqry8urySqrZ3Gr13Gr17Aa4U ua1rJa48WFWUC3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Sb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07bOFxUUUUUU= 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 (ksyntaxhighlighting-6): New variable. (ksyntaxhighlighting): Inherit above. Change-Id: I7c6cfa1f98137a7ee61ea4d7081c9af5da68cbea --- gnu/packages/kde-frameworks.scm | 57 ++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 4ac8ffa1c6..bb38fd33ce 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1343,10 +1343,10 @@ (define-public kplotting (list extra-cmake-modules qttools-5)) (arguments '()))) -(define-public ksyntaxhighlighting +(define-public ksyntaxhighlighting-6 (package (name "ksyntaxhighlighting") - (version "5.114.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (string-append @@ -1355,27 +1355,25 @@ (define-public ksyntaxhighlighting "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63")))) + "1dnacxfrr0llsv2zkn55iywrp3lm8xb7w5fn2pb9fghf5c2ljx0y")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl qttools-5 - ;; Optional, for compile-time validation of syntax definition files: - qtxmlpatterns)) + (list extra-cmake-modules perl qttools)) (inputs - (list qtbase-5)) + (list qtbase qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'unpatch-source-shebang - (lambda _ - ;; revert the patch-shebang phase on scripts which are - ;; in fact test data - (substitute* '("autotests/input/highlight.sh" - "autotests/folding/highlight.sh.fold") - (((which "sh")) " /bin/sh")) ;; space in front! - (substitute* '("autotests/input/highlight.pl" - "autotests/folding/highlight.pl.fold") - (((which "perl")) "/usr/bin/perl"))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'patch-source-shebangs 'unpatch-source-shebang + (lambda _ + ;; revert the patch-shebang phase on scripts which are + ;; in fact test data + (substitute* '("autotests/input/highlight.sh" + "autotests/folding/highlight.sh.fold") + (((which "sh")) " /bin/sh")) ;; space in front! + (substitute* '("autotests/input/highlight.pl" + "autotests/folding/highlight.pl.fold") + (((which "perl")) "/usr/bin/perl"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Syntax highlighting engine for Kate syntax definitions") (description "This is a stand-alone implementation of the Kate syntax @@ -1386,6 +1384,27 @@ (define-public ksyntaxhighlighting (properties `((upstream-name . "syntax-highlighting"))) (license license:lgpl2.1+))) +(define-public ksyntaxhighlighting + (package + (inherit ksyntaxhighlighting-6) + (name "ksyntaxhighlighting") + (version "5.114.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "syntax-highlighting-" version ".tar.xz")) + (sha256 + (base32 + "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63")))) + (native-inputs + (list extra-cmake-modules perl qttools-5 + ;; Optional, for compile-time validation of syntax definition files: + qtxmlpatterns)) + (inputs + (list qtbase-5)))) + (define-public plasma-wayland-protocols (package (name "plasma-wayland-protocols")