From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WPArJ7RDCGaMEAEAqHPOHw:P1 (envelope-from ) for ; Sat, 30 Mar 2024 17:54:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WPArJ7RDCGaMEAEAqHPOHw (envelope-from ) for ; Sat, 30 Mar 2024 17:54:12 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711817652; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=V1We6oL7E8/Mpcg6bKgJiu94ETauFkUHB3A7gOuXORY=; b=H3CMhvkv9f3c67qukvAI2BSwhUaP0MOG9K339ZF59eGrCTNy6pQ3BSpdYMeyjpCjicoY5b totZCdM/YggthXcoIGaSe5374szIrL5wIr/D/dSygaAd/O9nrWev9j33iVjlKspeqQ9xs5 UVRVS0JaDYJy6FuCaPFOMoA7KesTwacvzx4QUAX9g8gCkb6/evQOBsg0YWM6dRlh7YKmtw 68LNFVw/u/b1Y0LdbAGQjN+bdCt4+H3bBqlT8W1e6JIgAIkE1CfY+xhp+wM5KdrvrWlCyW hRPeLdErW0eI9pjxCxFZHzkrl+fYuCdxWISQGtlde6wcf47CxFG3Wk29a0KezQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711817652; a=rsa-sha256; cv=none; b=n9oV39piDV+BKrdQUuQSsHoapOub7ZaSs+Z5Bjx78bRV+H/0cl1DAP7G13WsXcbU9EhSU7 a/VEkPHhk30ZU9D/71DhqAMrjox2BlTTqBeMfu/GA4DJU9RdV/spVNLHqlWqNnA9XHXmwc s9o6zK/kIKV3UUWvRLnLzdik3Sl5emQTedf0HBYYNtXrcGfI6XPGXu0dKbyaPk0xMri6bo OKOmP2cwpWCOlJOKdFIfX67dQs6T5MtLoWvo9Sx/E1I4BGuS7FDdHXUXiyCqmns/8POrXr poIbz99j1mgbe6J/Vf+eGh4L0E5huP3BHcs0IfklwnRsLBYDe7HNmslYs6Ok0g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3EFAB11FC1 for ; Sat, 30 Mar 2024 17:54:11 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqbxy-0005k0-9U; Sat, 30 Mar 2024 12:54:02 -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 1rqbxv-0005jP-UV for guix-patches@gnu.org; Sat, 30 Mar 2024 12:53:59 -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 1rqbxv-0002xg-MF for guix-patches@gnu.org; Sat, 30 Mar 2024 12:53:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqbxx-00025H-LP for guix-patches@gnu.org; Sat, 30 Mar 2024 12:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70047] [PATCH] gnu: highlight: Update to 4.11. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 16:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70047 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: chris Cc: 70047@debbugs.gnu.org Received: via spool by 70047-submit@debbugs.gnu.org id=B70047.17118176117933 (code B ref 70047); Sat, 30 Mar 2024 16:54:01 +0000 Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 16:53:31 +0000 Received: from localhost ([127.0.0.1]:46113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqbxS-00023s-Og for submit@debbugs.gnu.org; Sat, 30 Mar 2024 12:53:31 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:50606 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqbxO-00023b-S9 for 70047@debbugs.gnu.org; Sat, 30 Mar 2024 12:53:29 -0400 Received: from m (unknown [183.247.5.22]) by APP-05 (Coremail) with SMTP id zQCowACnNBJ3QwhmWOQ7AA--.18277S2; Sun, 31 Mar 2024 00:53:12 +0800 (CST) References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@bumblehead.com> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Z572 Date: Sun, 31 Mar 2024 00:24:48 +0800 In-reply-to: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@bumblehead.com> Message-ID: <87wmpj8xxz.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: zQCowACnNBJ3QwhmWOQ7AA--.18277S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Ww17Cr1rGr1UKryxtrWkWFg_yoW3tw4DpF y2vwsayryUJw1jqw4rXFZ3Zry5KF4Skw4jqwsFvrnFkw4UtF40vryIqFZ5ur1xKwnxG343 GF4rAF15GFWUW3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyEb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Jr0_Gr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7Aq F2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4 A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY 0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I 0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAI cVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcV CF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8v_M3UUUUU== X-Originating-IP: [183.247.5.22] 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -8.45 X-Migadu-Queue-Id: 3EFAB11FC1 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.45 X-TUID: wGDozRyn7WAs --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable chris writes: > * (highlight): Update to 4.11. please add more info for commit message * gnu/packages/pretty-print.scm (highlight): Update to 4.11. [source]: Switch to git-fetch [home-page]: Switch to html page. > > `guix lint highlight` moved the "arguments" nesting, otherwise few change= s. > The source is changed to gitlab and the php not-found homepage url is cha= nged > to an available html url > > Change-Id: I0c402fcea5708c4882b52309b3e072301f0a5614 > --- > gnu/packages/pretty-print.scm | 163 +++++++++++++++++----------------- > 1 file changed, 81 insertions(+), 82 deletions(-) > > diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm > index b95f56729a..13668712d1 100644 > --- a/gnu/packages/pretty-print.scm > +++ b/gnu/packages/pretty-print.scm > @@ -11,6 +11,7 @@ > ;;; Copyright =C2=A9 2022 Zhu Zihao > ;;; Copyright =C2=A9 2022, 2023 Maxim Cournoyer > ;;; Copyright =C2=A9 2023 gemmaro > +;;; Copyright =C2=A9 2024 chris > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -352,93 +353,91 @@ (define-public source-highlight > (define-public highlight > (package > (name "highlight") > - (version "4.8") > + (version "4.11") > (outputs (list "out" "gui")) > - (source (origin > - (method url-fetch) > - (uri (string-append "http://www.andre-simon.de/zip/highlig= ht-" > - version ".tar.bz2")) > - (sha256 > - (base32 > - "1iggdw4c8pfz1z1c51fyd6x79y1mnc82b6lfkg3vbb44739m5cjs")) > - (patches (search-patches "highlight-gui-data-dir.patch")))) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.com/saalen/highlight") In fact http://www.andre-simon.de/zip/highlight-4.11.tar.bz2 can download, but I also think git-fetch is better. > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0xb9jm7249qnbain4l94nakgxsmia4w4x246dagr669fkmffcdmg")) > + (patches (search-patches "highlight-gui-data-dir.patch")))) > (build-system gnu-build-system) > (arguments > - (list #:tests? #f ;no tests > - #:make-flags #~(let ((confdir (string-append %output > - "/share/highlight/config/"))) > - (list (string-append "PREFIX=3D" %output) > - (string-append "HL_CONFIG_DIR=3D" conf= dir) > - (string-append "conf_dir=3D" confdir))) > - #:phases #~(modify-phases %standard-phases > - (delete 'configure) ;no configure script > - (add-after 'unpack 'fix-search-for-lua > - (lambda _ > - (let ((ver #$(version-major+minor (package-v= ersion > - lua)))) > - (substitute* "src/makefile" > - (("(LUA_PKG_NAME=3D).*" _ assignment) > - (string-append assignment "lua-" ver "\= n"))) > - (substitute* "src/gui-qt/highlight.pro" > - (("(PKGCONFIG \\+=3D lua)" _ assignment) > - (string-append assignment "-" ver))) > - (substitute* "extras/swig/makefile" > - (("lua") > - (string-append "lua-" ver)))))) > - (add-after 'build 'build-gui > - (lambda* (#:key inputs outputs #:allow-other-k= eys) > - (let* ((out (assoc-ref outputs "out")) > - (data (string-append out > - "/share/highligh= t/")) > - (conf (string-append out "/etc/highli= ght/")) > - (doc (string-append out > - "/share/doc/highlight/")) > - (gui (assoc-ref outputs "gui")) > - (gui-data (string-append gui > - "/share/highlight/"))) > - ;; modified version of gui task in makefile > - (invoke "make" > - "-C" > - "./src" > - "-f" > - "./makefile" > - (string-append "HL_DATA_DIR=3D" da= ta) > - (string-append "HL_CONFIG_DIR=3D" = conf) > - (string-append "HL_DOC_DIR=3D" doc) > - (string-append "GUI_DATA_DIR=3D" g= ui-data) > - "gui-qt")))) > - (replace 'install > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out"))) > - (invoke "make" "install" > - (string-append "PREFIX=3D" out))))) > - (add-after 'install 'install-perl-bindings > - (lambda* (#:key outputs #:allow-other-keys) > - (let* ((out (assoc-ref outputs "out")) > - (data (string-append out > - "/share/highligh= t/")) > - (conf (string-append out "/etc/highli= ght/")) > - (perldir (string-append out > - "/lib/perl5/site_perl/" > - #$(package-version perl))) > - (autodir (string-append perldir > - "/auto/highli= ght"))) > - (with-directory-excursion "extras/swig" > - (invoke "make" "perl" > - (string-append "hl_data_dir=3D" = data) > - (string-append "hl_conf_dir=3D" = conf)) > - (invoke "perl" "-I" "." "testmod.pl") > - (install-file "highlight.pm" perldir) > - (install-file "highlight.so" autodir))))) > - (add-after 'install 'install-gui > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((gui (assoc-ref outputs "gui"))) > - (mkdir-p (string-append gui "/bin")) > - (invoke "make" "install-gui" > - (string-append "PREFIX=3D" gui))))= )))) > + (list > + #:tests? #f ;no tests > + #:make-flags #~(let ((confdir (string-append %output > + "/share/highlight/con= fig/"))) > + (list (string-append "PREFIX=3D" %output) An optional suggestion, please replace "%output" with "#$output" > + (string-append "HL_CONFIG_DIR=3D" confdir) > + (string-append "conf_dir=3D" confdir))) > + #:phases #~(modify-phases %standard-phases > + (delete 'configure) ;no configure script > + (add-after 'unpack 'fix-search-for-lua > + (lambda _ > + (let ((ver #$(version-major+minor (package-versio= n lua)))) can you use `(this-package-input "lua")' replace `lua' ? It allow user replace with a different version lua > + (substitute* "src/makefile" > + (("(LUA_PKG_NAME=3D).*" _ assignment) > + (string-append assignment "lua-" ver "\n"))) > + (substitute* "src/gui-qt/highlight.pro" > + (("(PKGCONFIG \\+=3D lua)" _ assignment) > + (string-append assignment "-" ver))) > + (substitute* "extras/swig/makefile" > + (("lua") > + (string-append "lua-" ver)))))) > + (add-after 'build 'build-gui > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (data (string-append out "/share/highlight= /")) > + (conf (string-append out "/etc/highlight/"= )) > + (doc (string-append out "/share/doc/highli= ght/")) > + (gui (assoc-ref outputs "gui")) > + (gui-data (string-append gui "/share/highl= ight/"))) > + ;; modified version of gui task in makefile > + (invoke "make" > + "-C" > + "./src" > + "-f" > + "./makefile" > + (string-append "HL_DATA_DIR=3D" data) > + (string-append "HL_CONFIG_DIR=3D" conf) > + (string-append "HL_DOC_DIR=3D" doc) > + (string-append "GUI_DATA_DIR=3D" gui-da= ta) > + "gui-qt")))) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (invoke "make" "install" > + (string-append "PREFIX=3D" out))))) > + (add-after 'install 'install-perl-bindings > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (data (string-append out "/share/highlight= /")) > + (conf (string-append out "/etc/highlight/"= )) > + (perldir (string-append out > + "/lib/perl5/site_p= erl/" > + #$(package-version= perl))) can you use `(this-package-input "perl")' replace `perl' ? It allow user replace with a different version perl > + (autodir (string-append perldir > + "/auto/highlight")= )) > + (with-directory-excursion "extras/swig" > + (invoke "make" "perl" > + (string-append "hl_data_dir=3D" data) > + (string-append "hl_conf_dir=3D" conf)) > + (invoke "perl" "-I" "." "testmod.pl") > + (install-file "highlight.pm" perldir) > + (install-file "highlight.so" autodir))))) > + (add-after 'install 'install-gui > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((gui (assoc-ref outputs "gui"))) > + (mkdir-p (string-append gui "/bin")) > + (invoke "make" "install-gui" > + (string-append "PREFIX=3D" gui)))))))) > (inputs (list lua boost perl qtbase-5)) > (native-inputs (list pkg-config swig)) > - (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.ph= p") > + (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.ht= ml") > (synopsis "Convert code to documents with syntax highlighting") > (description > "Highlight converts source code to HTML, XHTML, RTF, LaTeX, > > base-commit: c2c1098585b10f42bed7647f2130a2727c0488f8 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYIQygACgkQO1qpk+Gi 3/ANsQ//QUA42RqHUaaveJOhdSAwvOp9cDUQERCY3uV3MXveIvAOGs/VfjXgQWUX O8qxR6X21AOJK/eCLQFzu7DuhfoJJMMELJruED3e6p4a2qmHIpsCcrMq2Ce6gNky YcQOsFjq04ggGTfRc0B4a5vI7fLti780GpBWliTUSw6TpCY9czZWYggwhAVV5RsO kQfzJYEyWUM0gf0degr1jt1aYi3SqK7Usez3ZWlHRS3N12b8/qs4mbZSdR1Ny+Yl LJzw8e2LeKPH2QIt3aT8DI6g8B99ZRA4u7KAOfQcqd59N6MzoHtA5zlSB6hgIfCm 9Wc47k0ZABN5CCl7yxINgy1Wc6XS7mpywuIhEckL2XcCFfuqWy7GuT0NBItW2sfi OrxB8MH7WVg+KuTmE5qFwn5SoTZD4k/JM2aLv7pA+CPzSLfO0O8/82hxOsRGqY4M IyGJ6kIvNs4ABcssaNJiJ/q1xzVbSEm945eVfZt6uqh7MQ8AUFHp1RS40VUpJ0qt xFku5OxeZaBBaiSJ891B4SvpsNsuhVFxlhDK6Df2tXRWJ7NUdIQCMrcHyDNYcjj3 yl9bezmHTqR+dI4nmgw/SZwWnpdwP7EFUnV9zst2gl3V7ccDcfBBHMtowcNuHdjX Hedm4bOmty1QG/UN/Dvy3Ih/GZIKql9d6Chn65aQoGe4qn7N5jg= =NSmc -----END PGP SIGNATURE----- --=-=-=--