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 ms1.migadu.com with LMTPS id wDJiHre8MGZmlQAAqHPOHw:P1 (envelope-from ) for ; Tue, 30 Apr 2024 11:41:11 +0200 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 wDJiHre8MGZmlQAAqHPOHw (envelope-from ) for ; Tue, 30 Apr 2024 11:41:11 +0200 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=1714470071; 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: content-transfer-encoding:content-transfer-encoding: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=yqbqTniA6pwwnDKcz97KR87xKrrNFkl8c89at2hI5EA=; b=CjpvMTrjBRDbSiuPvZXuRpKMTEDZa1tU2wcS2WuAlApZRNJr1Ln17BNAKDUNIL2nmNqZPu 9gg1KLAyma6m2MKNQjH2qFrlRH8gP6qGUM/3Fn5ko9oZ4T7RKLV62h80o5NaJ6Hj63BOGl D694H3Sgh3TwbwEetCU3fKzbHhgKcTtUwSplTkhGEe4AL1eaTjZySgrxrq65AxUijLqOIE T2Ou+PNELW3ByK/FgquJDjT52t6sI30FydyqXArJYQtiszdcgAYZwuHALT2GiiaQnZHt79 WuPzXj7TYqs+VtHLAs9uZSJw4W6pCD8kAxBnBO3DDYw9xe6sUVNuHvsAdB1dBw== 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=1714470071; a=rsa-sha256; cv=none; b=D+Xki4XRe7nCZItEC1GW9Y4yyZaVVxOy7O/DBwzuNCtSemqlkPF1f8h5aKe7bqmO/ZChum LNzU2MoKnVi+xPK7GfxmCFZw6qpZP10nd6qYJ4L4ANZQ7Zj9WmJviU6EO7pOpY3ADIDjRO rZPHycr/E0BkzqAeNqsjslsabV+xOP8lcojBBDBk9omHXu0cPaplgOleDPbFC/EJEbPKRs JJLgu4uLvwdo2jej7KMi/5uz5HZX4I/CTMp8xfk2HCgGREyNFRKLtiUhuhobdjA4rWxybm 7aEiWBSyzWsTfGXBPySCQ6iYEsu3evNuOZl017JGfg9kzPiKmk/qoscwnlco6w== 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 288B6517E0 for ; Tue, 30 Apr 2024 11:41:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1jyj-00048b-Hb; Tue, 30 Apr 2024 05:40:50 -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 1s1jye-000487-GA for guix-patches@gnu.org; Tue, 30 Apr 2024 05:40:44 -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 1s1jyb-0005lx-Sa for guix-patches@gnu.org; Tue, 30 Apr 2024 05:40:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1jyw-0000if-4h for guix-patches@gnu.org; Tue, 30 Apr 2024 05:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70047] [PATCH v2] gnu: highlight: Update to 4.11. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 09:41:02 +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: 70047@debbugs.gnu.org Cc: guix-devel-0brg6a@rdmp.org, chris@bumblehead.com X-Debbugs-Original-Cc: Dale Mellor , chris , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17144700262709 (code B ref -1); Tue, 30 Apr 2024 09:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2024 09:40:26 +0000 Received: from localhost ([127.0.0.1]:59287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1jyK-0000hX-Oq for submit@debbugs.gnu.org; Tue, 30 Apr 2024 05:40:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1jyG-0000h9-Uc for submit@debbugs.gnu.org; Tue, 30 Apr 2024 05:40:23 -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 1s1jxq-00044t-9d for guix-patches@gnu.org; Tue, 30 Apr 2024 05:39:54 -0400 Received: from [195.15.247.228] (helo=rdmp.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1jxm-0005Rb-Br for guix-patches@gnu.org; Tue, 30 Apr 2024 05:39:53 -0400 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1s1jxg-0006dw-2G; Tue, 30 Apr 2024 09:39:45 +0000 From: Dale Mellor Date: Tue, 30 Apr 2024 10:39:28 +0100 Message-ID: <20240430093928.1239052-1-guix-devel-0brg6a@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@bumblehead.com> References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@bumblehead.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 195.15.247.228 (failed) Received-SPF: pass client-ip=195.15.247.228; envelope-from=guix-devel-0brg6a@rdmp.org; helo=rdmp.org X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.39 X-Spam-Score: -5.39 X-Migadu-Queue-Id: 288B6517E0 X-Migadu-Scanner: mx13.migadu.com X-TUID: jTz6bvSGbwxa From: chris * gnu/packages/pretty-print.scm (highlight): Update to 4.11. [source]: Switch to git-fetch. [home-page]: Switch to html page. [arguments]<#:make-flags>: Use #$output replace %output. <#:phases>: Use ‘this-package-input‘ to find lua and perl. Review: * guix build --check, guix build --source-check, guix lint all clean. * Changes look good. * It works for me on Guix system. * It does not work on foreign distribution (neither did the old version). Reviewed-by: Dale Mellor Change-Id: I0c402fcea5708c4882b52309b3e072301f0a5614 --- gnu/packages/pretty-print.scm | 165 +++++++++++++++++----------------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 7eae40a220..220761fc07 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 chris ;;; ;;; This file is part of GNU Guix. ;;; @@ -352,93 +353,93 @@ (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/highlight-" - 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") + (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=" %output) - (string-append "HL_CONFIG_DIR=" confdir) - (string-append "conf_dir=" 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-version - lua)))) - (substitute* "src/makefile" - (("(LUA_PKG_NAME=).*" _ assignment) - (string-append assignment "lua-" ver "\n"))) - (substitute* "src/gui-qt/highlight.pro" - (("(PKGCONFIG \\+= 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/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=" data) - (string-append "HL_CONFIG_DIR=" conf) - (string-append "HL_DOC_DIR=" doc) - (string-append "GUI_DATA_DIR=" gui-data) - "gui-qt")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" "install" - (string-append "PREFIX=" 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_perl/" - #$(package-version perl))) - (autodir (string-append perldir - "/auto/highlight"))) - (with-directory-excursion "extras/swig" - (invoke "make" "perl" - (string-append "hl_data_dir=" data) - (string-append "hl_conf_dir=" 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=" gui)))))))) + (list + #:tests? #f ;no tests + #:make-flags #~(let ((confdir (string-append #$output + "/share/highlight/config/"))) + (list (string-append "PREFIX=" #$output) + (string-append "HL_CONFIG_DIR=" confdir) + (string-append "conf_dir=" 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-version (this-package-input "lua"))))) + (substitute* "src/makefile" + (("(LUA_PKG_NAME=).*" _ assignment) + (string-append assignment "lua-" ver "\n"))) + (substitute* "src/gui-qt/highlight.pro" + (("(PKGCONFIG \\+= 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/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=" data) + (string-append "HL_CONFIG_DIR=" conf) + (string-append "HL_DOC_DIR=" doc) + (string-append "GUI_DATA_DIR=" gui-data) + "gui-qt")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" + (string-append "PREFIX=" 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_perl/" + #$(package-version + (this-package-input "perl")))) + (autodir (string-append perldir + "/auto/highlight"))) + (with-directory-excursion "extras/swig" + (invoke "make" "perl" + (string-append "hl_data_dir=" data) + (string-append "hl_conf_dir=" 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=" 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.php") + (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.html") (synopsis "Convert code to documents with syntax highlighting") (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX, -- 2.41.0