Received: (at 70047) by debbugs.gnu.org; 30 Apr 2024 09:40:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 30 05:40:15 2024
Received: from localhost ([127.0.0.1]:59284 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s1jyB-0000h8-1B
for submit <at> debbugs.gnu.org; Tue, 30 Apr 2024 05:40:15 -0400
Received: from [195.15.247.228] (port=15484 helo=rdmp.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <guix-devel-0brg6a@HIDDEN>) id 1s1jy7-0000gu-He
for 70047 <at> debbugs.gnu.org; Tue, 30 Apr 2024 05:40:14 -0400
Received: from [127.0.0.1] (helo=localhost.localdomain)
by rdmp.org with esmtp (Exim 4.96.1)
(envelope-from <guix-devel-0brg6a@HIDDEN>) id 1s1jxg-0006dw-2G;
Tue, 30 Apr 2024 09:39:45 +0000
From: Dale Mellor <guix-devel-0brg6a@HIDDEN>
To: 70047 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: highlight: Update to 4.11.
Date: Tue, 30 Apr 2024 10:39:28 +0100
Message-ID: <20240430093928.1239052-1-guix-devel-0brg6a@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: From: chris <chris@HIDDEN> * 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 â [...]
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
0.0 T_PDS_PRO_TLD .pro TLD
[URI: highlight.pro (pro)]
1.3 RDNS_NONE Delivered to internal network by a host with no rDNS
X-Debbugs-Envelope-To: 70047
Cc: Dale Mellor <guix-devel-0brg6a@HIDDEN>, chris <chris@HIDDEN>,
guix-patches@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
From: chris <chris@HIDDEN>
* 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 <guix-devel-0brg6a@HIDDEN>
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 <all_but_last@HIDDEN>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+;;; Copyright © 2024 chris <chris@HIDDEN>
;;;
;;; 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
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 30 Apr 2024 09:40:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 30 05:40:25 2024
Received: from localhost ([127.0.0.1]:59287 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s1jyK-0000hX-Oq
for submit <at> 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 <guix-devel-0brg6a@HIDDEN>) id 1s1jyG-0000h9-Uc
for submit <at> 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 <guix-devel-0brg6a@HIDDEN>)
id 1s1jxq-00044t-9d
for guix-patches@HIDDEN; 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 <guix-devel-0brg6a@HIDDEN>)
id 1s1jxm-0005Rb-Br
for guix-patches@HIDDEN; 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 <guix-devel-0brg6a@HIDDEN>) id 1s1jxg-0006dw-2G;
Tue, 30 Apr 2024 09:39:45 +0000
From: Dale Mellor <guix-devel-0brg6a@HIDDEN>
To: 70047 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: highlight: Update to 4.11.
Date: Tue, 30 Apr 2024 10:39:28 +0100
Message-ID: <20240430093928.1239052-1-guix-devel-0brg6a@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
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@HIDDEN; 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-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Dale Mellor <guix-devel-0brg6a@HIDDEN>, chris <chris@HIDDEN>,
guix-patches@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
From: chris <chris@HIDDEN>
* 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 <guix-devel-0brg6a@HIDDEN>
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 <all_but_last@HIDDEN>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+;;; Copyright © 2024 chris <chris@HIDDEN>
;;;
;;; 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
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
Received: (at 70047) by debbugs.gnu.org; 31 Mar 2024 06:00:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 31 02:00:38 2024
Received: from localhost ([127.0.0.1]:46466 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rqoFB-0001C0-Rc
for submit <at> debbugs.gnu.org; Sun, 31 Mar 2024 02:00:38 -0400
Received: from mx.kolabnow.com ([212.103.80.154]:59120)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <chris@HIDDEN>) id 1rqoF7-0001Ba-20
for 70047 <at> debbugs.gnu.org; Sun, 31 Mar 2024 02:00:36 -0400
Received: from localhost (unknown [127.0.0.1])
by mx.kolabnow.com (Postfix) with ESMTP id 5265120827BE
for <70047 <at> debbugs.gnu.org>; Sun, 31 Mar 2024 08:00:24 +0200 (CEST)
Authentication-Results: ext-mx-out011.mykolab.com (amavis);
dkim=pass (4096-bit key) reason="pass (just generated, assumed good)"
header.d=kolabnow.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h=
content-transfer-encoding:content-type:content-type:mime-version
:message-id:date:date:subject:subject:from:from:received
:received:received; s=dkim20160331; t=1711864822; x=1713679223;
bh=3OkbjYp6ce4JPv9xhgqovOyBkj1OttfnAil/HxKTU/4=; b=zs7d1Q734RPz
3l2EZ2c/tjurQ3JXCavg6FuyprxeeoQR2bREIMQ/drnYtZOXTccpApkR4gSMAGXy
R4eoqI3uDWC/bzbzzwKhrwcaX4TSRNxCvlVsePywJR9nNtl9u4uOOLEWXAoEPxrT
U0RcAbq3NAJzDyjA39LB4NLfMy7CGU0r8X0pZJ1FzvDYe3I8W67t3+MZLg/iHbrj
782dsRmY+G/OtJdy1aZ6+lJs5rMUoqC5wpFB/tmllHs1rX3yHGr6sSAeZV2EBpCp
tEzsXBnx92og9eF2tU5uJv6zk1brJHoPT/IIPYI4rDnAMzwhmSIZbf8h2xts2DZZ
b4Zd6jfqZsx7/IqNJW3nETEfBzaT3iY9T/a/hXR8WWH54sXC9erhD6+w/KB/oJbM
P9fl3FTQHUO00l2/fzqb/vBCC4/8eeAk0tCjp9QRndlxKeKNf7DZnuhbn/X5JG1o
tiHSQsdFp6CgIWWdpmVnkjtUncLqX+upxfhSTx5qGeeqkWML1L9YkVL+onCkjxuN
MSn1ivXmFnTTHTXkmy3lFABB7F05mLYZEcfoOXKIBej1ddhghwV0eQBOVMe9n/AV
4VqwZrdZz4yxw5yUCwY42FPg2tuHx+iyXfsrcYbjZ9bqlycyP0hu0AikuYIXUKlU
/8jhC7Tf9wlc2mYCPYuLcQujd52Wkb8=
X-Virus-Scanned: amavis at mykolab.com
X-Spam-Flag: NO
X-Spam-Score: -0.99
X-Spam-Level:
X-Spam-Status: No, score=-0.99 tagged_above=-10 required=5
tests=[ALL_TRUSTED=-1, T_PDS_PRO_TLD=0.01] autolearn=ham autolearn_force=no
Received: from mx.kolabnow.com ([127.0.0.1])
by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024)
with ESMTP id FIVZwJIiqKA9 for <70047 <at> debbugs.gnu.org>;
Sun, 31 Mar 2024 08:00:22 +0200 (CEST)
Received: from int-mx011.mykolab.com (unknown [10.9.13.11])
by mx.kolabnow.com (Postfix) with ESMTPS id 7F60320827A3
for <70047 <at> debbugs.gnu.org>; Sun, 31 Mar 2024 08:00:21 +0200 (CEST)
Received: from ext-subm010.mykolab.com (unknown [10.9.6.10])
by int-mx011.mykolab.com (Postfix) with ESMTPS id 01F5B30ED5FA
for <70047 <at> debbugs.gnu.org>; Sun, 31 Mar 2024 08:00:20 +0200 (CEST)
From: chris <chris@HIDDEN>
To: 70047 <at> debbugs.gnu.org
Subject: [PATCH] gnu: highlight: Update to 4.11.
Date: Sat, 30 Mar 2024 22:58:47 -0700
Message-ID: <9d2674a6a3dab989ee78bd41e75c2c24c0eff83c.1711864727.git.chris@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70047
Cc: chris <chris@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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.
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 b95f56729a..fa46061303 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@HIDDEN>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+;;; Copyright © 2024 chris <chris@HIDDEN>
;;;
;;; 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,
base-commit: c2c1098585b10f42bed7647f2130a2727c0488f8
--
2.41.0
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.Received: (at 70047) by debbugs.gnu.org; 31 Mar 2024 04:57:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 31 00:57:55 2024 Received: from localhost ([127.0.0.1]:46436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rqnGV-0005ZI-2p for submit <at> debbugs.gnu.org; Sun, 31 Mar 2024 00:57:55 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:50044 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zhengjunjie@HIDDEN>) id 1rqnGR-0005Yv-Be for 70047 <at> debbugs.gnu.org; Sun, 31 Mar 2024 00:57:53 -0400 Received: from m (unknown [183.247.5.22]) by APP-01 (Coremail) with SMTP id qwCowAAX+VFA7QhmDfRaAA--.734S2; Sun, 31 Mar 2024 12:57:37 +0800 (CST) References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN> <87wmpj8xxz.fsf@HIDDEN> <ZgiDb_d6QrjZLpUF@guix-xps> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie <zhengjunjie@HIDDEN> To: chris <chris@HIDDEN> Subject: Re: [bug#70047] [PATCH] gnu: highlight: Update to 4.11. Date: Sun, 31 Mar 2024 12:28:21 +0800 In-reply-to: <ZgiDb_d6QrjZLpUF@guix-xps> Message-ID: <87jzljhubz.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowAAX+VFA7QhmDfRaAA--.734S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Xw1UAw1UJw13tF1kGrW7Jwb_yoW3urX_ZF 9rXa43WFZ7Gr4DKwsrKan8ZFn7uas3Ar9F9a4qqF15tr1rZFWrWFs5CFyfWr4fJF47KrZI kF1Dua90vrnagjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb78YjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z2 80aVCY1x0267AKxVW8JVW8Jr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7Aq 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70047 Cc: 70047 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable chris <chris@HIDDEN> writes: > On 3=E6=9C=8831=E6=97=A5 =E6=97=A5, Z572 wrote: >>=20 >> please add more info for commit message >>=20 > > Z572, the commit is patched with your suggested changes. If you > believe a different message is needed, feel free to send a specific > git commit message you think is best and I will amend the commit with > that :) thank you Refer to other commits(you can use like 'git log =2D-grep=3Dthis-package-input' to see it), and see https://www.gnu.org/prep/standards/html_node/Change-Logs.html It should look something like this. * 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 =E2=80=98this-package-input=E2=80=98 to find lua and perl. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYI7TAACgkQO1qpk+Gi 3/Di/hAAhsOCbuwfqIBok9EADVotguyK8jtoxhTzssBsd0DdDvZlK1Ais4zMKKa+ bfLEodf5z6XD7Hd9B4RXPIaV5br+HFDFhmvmDl+FyYHNMGz7nAKRYWKHvFXQouPu hx4STEqbvZfowgLLNCoBrHmBNY1mivZlPc3+ukhMS8PYpaDJqdhzoW+cn5HGoPSf I9WqmbG31z9RMDCVapTe8qbbQbkx/UVNYOZxa1fdlVTuRhX2qjchdO9wDtm6Kfri REIj+6V9ePChsPrP5BzrRjiQSHB4oUUv0/nM5fPoPELXSvtsaeKcSOYV1WtcUSJp 5jzvX7eKjdE0v5kyXkgNVc/t5XUKD62W8svRhqBG5CFp57ccUN8yUezk5E+AFGWo HVb/uYfqDNjl4J31mqGKYr43SN3U11g7C0NZUuO9ogfZuaUmC8JEpYds4jGhNhuW Le5mPk07e/CBq+m/55OHdODu7NpIEUClK8G35EZ320bkxuMnoskFpLpW7Y9GYkMX 2KpI1YYviwK+I6hEUgfrasW9V/Gcq7rOrlFHMkcRBFhyADFpqVZWomWNRAyqepS4 4j7Z2UA/bzWv8OVJcilstAzZDajJIQtdOLC1LvmSgFduIC9oKzuiTneNFBSyf3Th uO7IFgZj/PZLRpIOOuBGdHwlcBsjxxYJRACmyntVT6MA8+opCrs= =4xgn -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 21:27:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 30 17:27:44 2024 Received: from localhost ([127.0.0.1]:46262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rqgEp-0007ru-PF for submit <at> debbugs.gnu.org; Sat, 30 Mar 2024 17:27:43 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:44622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <chris@HIDDEN>) id 1rqgEm-0007rb-AU for 70047 <at> debbugs.gnu.org; Sat, 30 Mar 2024 17:27:41 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E02172095C2D; Sat, 30 Mar 2024 22:27:31 +0100 (CET) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= in-reply-to:content-transfer-encoding:content-disposition :content-type:content-type:mime-version:references:message-id :subject:subject:from:from:date:date:received:received:received; s=dkim20160331; t=1711834050; x=1713648451; bh=481Gw37lPGRidLz+ lKZ1KWChSYTcGtj+CFGKehvxR2k=; b=Kr588Cx+u2HgSNcPVUBk9qGARoIBrNtp Oqdb6VONLexVZpPd9s6rHneL+AY/P+7hCaUtkCsnQTbDJpeV/LxwPITXy3Q7L/G3 BQLGugf3mzOSml4uWK6fdq3emmRaiEtYKfZP9huhvu1BrQcc8ts4pzuQmksLZ831 AxwF+rShUeWyA7VXQWNercTHIqn7wG98nX7GKSEcojGPaJOHcR1V3mcKh3SSQ5H2 SiHSvdZsmdmEWvCJ0E2n2OdkZrStUyNBEcBCADcgtdaoAFLltjWROPg2Hnz/Uc19 m4qZU6oufXuuH/RHtTtaaGhg3EamrIg7z6H/1DzdR3dNIZdqcKFRrSdlIKf17fK+ EwSODoSMk7v2udSZ88hzFp5Byk490oVAsgve2sullLbIXukNKr8p+H6G1eL5f7TH 66eVIMAxYrvSGgiPfMmnkjJNyLuKry8mXzMt5pLg7cuRLZJLUqUdyMiLSnySjZv6 hR5ScFU1svRDxi7N/85iTVh6EGBf5uA5CfbuafOXB2KBZSV+d9O/w39QXriXXmrU ed/YTVl5ywnZhF9zuEtyDegQnFfB8zdGzVbRoLqcy6bGvNZ135ZE8SZCGeyQxz+s 6ou+S8O1eM6e5sqSuaHrH1Tr6JCHlqxXYbJBxOwDW3uyzILGaNkPqQX17rXSPA7h nINzisRPAWE= X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id luFUdREq4lv7; Sat, 30 Mar 2024 22:27:30 +0100 (CET) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id 6C5FB2095C26; Sat, 30 Mar 2024 22:27:29 +0100 (CET) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id 4605820D9DC6; Sat, 30 Mar 2024 22:27:29 +0100 (CET) Date: Sat, 30 Mar 2024 14:26:07 -0700 From: chris <chris@HIDDEN> To: Z572 <zhengjunjie@HIDDEN> Subject: Re: [bug#70047] [PATCH] gnu: highlight: Update to 4.11. Message-ID: <ZgiDb_d6QrjZLpUF@guix-xps> References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN> <87wmpj8xxz.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87wmpj8xxz.fsf@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70047 Cc: 70047 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 3月31日 日, Z572 wrote: > > please add more info for commit message > Z572, the commit is patched with your suggested changes. If you believe a different message is needed, feel free to send a specific git commit message you think is best and I will amend the commit with that :) thank you
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 20:50:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 30 16:50:16 2024
Received: from localhost ([127.0.0.1]:46246 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rqfeZ-00065S-MB
for submit <at> debbugs.gnu.org; Sat, 30 Mar 2024 16:50:16 -0400
Received: from mx.kolabnow.com ([212.103.80.154]:42380)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <chris@HIDDEN>) id 1rqfeU-00064w-U8
for 70047 <at> debbugs.gnu.org; Sat, 30 Mar 2024 16:50:14 -0400
Received: from localhost (unknown [127.0.0.1])
by mx.kolabnow.com (Postfix) with ESMTP id A7B0D2095C2D
for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 21:50:02 +0100 (CET)
Authentication-Results: ext-mx-out011.mykolab.com (amavis);
dkim=pass (4096-bit key) reason="pass (just generated, assumed good)"
header.d=kolabnow.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h=
content-transfer-encoding:content-type:content-type:mime-version
:message-id:date:date:subject:subject:from:from:received
:received:received; s=dkim20160331; t=1711831799; x=1713646200;
bh=bGeQjeCf/RKxRdjNRoqaiayBCdylc5fbsl5r/6c3iXI=; b=tgvRc/kXk/D+
sAMTailZA2E7wFLRY8lRJG+cq2SGlqA8F43FNlXXi4XJ18uN5/DWITHixQGX4dAD
bwB+c9Vq/Dk4zVfNRjxGdh9AqqBhUthruQNDKYKQYyz5N9RUVLHMx/FAOwQKqIze
D6xxUPA8z1gn2XfDjpDefYFsqOmR3G19LYE6A+eGWBhz9UudMjzZQicnBzbhSNAN
FdovbMDDi+VI5jDOAFiZ+EgVRZ21WocxqDTNWqdj0XcFqA89PRhT6PSJcbtpV15q
OvqzFYrJqp+Irm47Mw1B9DYWdPAgd4Zc5AjRAWA1gJLMYFcfVhjwnjN8vMmh3AGu
MdqPV5+oyT3IOXb2807n/MjlMUr6AKqDnVAJMHRxhjiUgBBq1BYyJbMKMe/i4w/Y
uy27TTWOR1rLO4840cN0FSnjlIjaSXpB2QQ8yP0m3BrspF+TTDM1LdAFdaCAgYav
eo8YX/6IYQfgcirwNEtaXODBk1nQQsZ2qcXSShM8EMlli6YpXu0ISfq0rX5TEhgl
H7AD7GgmZvvaI6lV4Up0WvAQT2tmzsmWsEOZ5o6waO9IMlvBJrrdcNSwc6ei34r4
jg2O8vW+VgfCiuQTT7XjDYuZycfxLbpcX9Hcj9FPx5mnQme8KqTKpSgLFAhFUeU0
sfeAHBoyVtzHP1RqoUwPmAPsKafyTcw=
X-Virus-Scanned: amavis at mykolab.com
X-Spam-Flag: NO
X-Spam-Score: -0.99
X-Spam-Level:
X-Spam-Status: No, score=-0.99 tagged_above=-10 required=5
tests=[ALL_TRUSTED=-1, T_PDS_PRO_TLD=0.01] autolearn=ham autolearn_force=no
Received: from mx.kolabnow.com ([127.0.0.1])
by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024)
with ESMTP id VtI_ZsVOBrl7 for <70047 <at> debbugs.gnu.org>;
Sat, 30 Mar 2024 21:49:59 +0100 (CET)
Received: from int-mx009.mykolab.com (unknown [10.9.13.9])
by mx.kolabnow.com (Postfix) with ESMTPS id 82BBF2095C26
for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 21:49:58 +0100 (CET)
Received: from ext-subm010.mykolab.com (unknown [10.9.6.10])
by int-mx009.mykolab.com (Postfix) with ESMTPS id C352020D9DC4
for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 21:49:58 +0100 (CET)
From: chris <chris@HIDDEN>
To: 70047 <at> debbugs.gnu.org
Subject: [PATCH] gnu: highlight: Update to 4.11.
Date: Sat, 30 Mar 2024 13:48:23 -0700
Message-ID: <8dd88efaf01a7d83823ae7d9723142bc15821a7d.1711831703.git.chris@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70047
Cc: chris <chris@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* (highlight): Update to 4.11.
Other changes include the following,
* linting is applied to the package definition. This moves the "arguments"
nesting and adds some noise to the diff,
* the package source is changed from url-fetch andre-simon.de/zip/download.html
to git-fetch gitlab.com/saalen/highlight/-/releases,
* the homepage url is changed; the previous url serves a not found error,
* per review, "#$output" replaces "%output",
* per review, `(this-package-input "lua")` replaces `lua`
to support different user-specified version lua
* per review, `(this-package-input "perl")` replaces `perl`
to support different user-specified version perl
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 b95f56729a..fa46061303 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@HIDDEN>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+;;; Copyright © 2024 chris <chris@HIDDEN>
;;;
;;; 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,
base-commit: c2c1098585b10f42bed7647f2130a2727c0488f8
--
2.41.0
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 19:57:34 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 30 15:57:34 2024 Received: from localhost ([127.0.0.1]:46192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rqepW-0002zF-2X for submit <at> debbugs.gnu.org; Sat, 30 Mar 2024 15:57:34 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:47616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <chris@HIDDEN>) id 1rqepQ-0002yt-3Q for 70047 <at> debbugs.gnu.org; Sat, 30 Mar 2024 15:57:28 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 9203F20827B9; Sat, 30 Mar 2024 20:57:15 +0100 (CET) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= in-reply-to:content-transfer-encoding:content-disposition :content-type:content-type:mime-version:references:message-id :subject:subject:from:from:date:date:received:received:received; s=dkim20160331; t=1711828634; x=1713643035; bh=/ObWVr2sVfndfaft FP6lcKg9zzdrH8LQC7XkIZYCLVI=; b=TYyDpA9qjTfOPCgB6umLs5jAop0LG2hx WLm5Mw8XcM1YtdK2Y3bR0aNMmEfs0XjYYB+LBzlIvNhseEgKUixdMnslVhUVbU0P DapP7l63tKddOWtADHTrxElcUcDsediUutEsfP/5QmKW51msIPiRpPGjiDYOoPuj /1uHtOKAZ2rzss/eNS92+GltagRvbbi45tDau2W6gQz4VzGhfDYQpOpfzTm7YYEb GpMwmDzateobYP8V+wvkqocTEFl2swyz6mH9SdS2XXQrZNcC99PYs2qdkQhKcw+W DUMNGR9rTaAtxgVXE3+m1WeHb0l6Vg+MK/fJdasELz+5IkiM3ff1eIPqlQWcA58s QLnJx1lR4AlW/q3RrajvVdhvKRAFe2Lz4NbIPkaY4GeDub5uM1UwffWU1WMI1Thv Ic+lfbhWrabo1F0tZMRUCBzDt0vhSMls6OwI+/BUDjKiaY9kKIpFghN5uIOW9tfj f34207WnCBNGwTbDGLemvc+7Qir9q3XoX25cE6IpQULdCwxkwK/GA/svf/l+rW9G Jsb2bl6R+paE/6nppKy+/YiivvdKyNoLUMM+PS4STecgOQRSB22c2FOZZb2IZcYI bj4nvSW6wu3Z212Reb4CN08e6WZBmaFiXwwYBhGuNVgh1BZMxziOadUv9P33jNg2 AWzeP2JTB7U= X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id xaA-RiJg6pvF; Sat, 30 Mar 2024 20:57:14 +0100 (CET) Received: from int-mx011.mykolab.com (unknown [10.9.13.11]) by mx.kolabnow.com (Postfix) with ESMTPS id 8465D2095C2D; Sat, 30 Mar 2024 20:57:10 +0100 (CET) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx011.mykolab.com (Postfix) with ESMTPS id 03F6930ED5EF; Sat, 30 Mar 2024 20:57:09 +0100 (CET) Date: Sat, 30 Mar 2024 12:55:47 -0700 From: chris <chris@HIDDEN> To: Z572 <zhengjunjie@HIDDEN> Subject: Re: [bug#70047] [PATCH] gnu: highlight: Update to 4.11. Message-ID: <ZghuQy1kiXuGb5Qk@guix-xps> References: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN> <87wmpj8xxz.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87wmpj8xxz.fsf@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70047 Cc: 70047 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 3月31日 日, Z572 wrote: > > chris <chris@HIDDEN> writes: > > > * (highlight): Update to 4.11. > > please add more info for commit message My novice git workflow usage may produce mistakes in the way updates are added here, however, I'll try to amend the previous commit and commit message with the suggested changes and send again. Any input or advice are welcome.
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 16:53:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 30 12:53:31 2024
Received: from localhost ([127.0.0.1]:46113 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rqbxS-00023s-Og
for submit <at> 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 <zhengjunjie@HIDDEN>) id 1rqbxO-00023b-S9
for 70047 <at> 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@HIDDEN>
User-agent: mu4e 1.10.8; emacs 30.0.50
From: Z572 <zhengjunjie@HIDDEN>
To: chris <chris@HIDDEN>
Subject: Re: [bug#70047] [PATCH] gnu: highlight: Update to 4.11.
Date: Sun, 31 Mar 2024 00:24:48 +0800
In-reply-to: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
Message-ID: <87wmpj8xxz.fsf@HIDDEN>
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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70047
Cc: 70047 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
chris <chris@HIDDEN> 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 <all_but_last@HIDDEN>
> ;;; Copyright =C2=A9 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.=
com>
> ;;; Copyright =C2=A9 2023 gemmaro <gemmaro.dev@HIDDEN>
> +;;; Copyright =C2=A9 2024 chris <chris@HIDDEN>
> ;;;
> ;;; 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-----
--=-=-=--
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.Received: (at 70047) by debbugs.gnu.org; 30 Mar 2024 00:12:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 29 20:12:57 2024 Received: from localhost ([127.0.0.1]:43649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rqMLA-000454-Lr for submit <at> debbugs.gnu.org; Fri, 29 Mar 2024 20:12:56 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:37440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <chris@HIDDEN>) id 1rqML8-00044j-2u for 70047 <at> debbugs.gnu.org; Fri, 29 Mar 2024 20:12:55 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 1AAA530E4184 for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 01:12:46 +0100 (CET) Authentication-Results: ext-mx-out013.mykolab.com (amavis); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-disposition:content-type:content-type:mime-version :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1711757562; x=1713571963; bh=X7Hn9tooljtSDNr0kjudh0EpuJ6qXO60EQbDJDujLVQ=; b=EwEt7+Wf/A8d PsyrkyOZZSGtaIxodDW2qDsgPySjo0ISf29iv+L5d4aVK/M0qcghKvhrwIsiEcbO AVBr6Dhp3qsO6vw8XSYl4apGrWCLmAtCA1TMedNso44XojEGCDpABwid+YkRv5dK FBYrHrkcQ+XZLRYq+x+xnCzyQFV30GPAEdDQAGF25yq3UO7f6EaO4hKbIt5AS+Ue wWWCD1r1x7Fm3ydQGmep1loKkUKLh5bYV3StipXr4vAqouQ06LDvE3a52/thMLmC FIHJbcJr+lkxs0Q0tc2ZVUedGWB6pNYbPIk6AVzdC1hNZ6IADSDeKcMKN0adwTE/ caKRbLBO01Wrm65sR7fquJH2PEGjXvleHhVZcypf7Plh6QVYkTAAcxdJVSNUdief blZ8gilSPMU8c/MpuJTWsCebqRHfhtnBWTAWrGtL8T/m8xGUqNtSl96hz5ba/q5Y 6PzLOntrimv9g0u7LphJksXkKCZlaisEGcurU4wv1q5lD8sd4S9De8RCr+dqD27i tVRfyJwN+PGd/7lX7cUTuL3jXpIKKas+B/e79Eq+0YLtPU9tXTvlcWTFI/kZW/rf +qcaBEjgniRXNkkGAolREmSV3lOCijvZPyXZtX3r2f+aD7NxzyWJNGwmjibWYBmv 9hL4oPcQuvQXat9e9vpe1ag0ZXdWFaw= X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out013.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id dqJvE8B_P7ZO for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 01:12:42 +0100 (CET) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id 7242C30E4183 for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 01:12:42 +0100 (CET) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id 02A9820D8EDF for <70047 <at> debbugs.gnu.org>; Sat, 30 Mar 2024 01:12:41 +0100 (CET) Date: Fri, 29 Mar 2024 17:11:20 -0700 From: chris <chris@HIDDEN> To: 70047 <at> debbugs.gnu.org Subject: why use git-fetch Message-ID: <ZgdYqIl521SM9-8d@guix-xps> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70047 Cc: chris@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) It may be useful to explain why url-fetch is replaced with git-fetch here. highlight@HIDDEN was released over a week ago and is only available from the gitlab location and not the website, https://gitlab.com/saalen/highlight/-/releases http://www.andre-simon.de/zip/download.html With other indicators, it seems the website exists now in a sort-of maintenance-mode. The website has bugs: for example, some pages aren't scrollable to some content can only be accessed by zooming out multiple steps. The gitlab project front page documentation seems more up-to-date and more usable as well.
guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 28 Mar 2024 09:26:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 28 05:26:48 2024
Received: from localhost ([127.0.0.1]:39066 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rpm20-00033Z-Jo
for submit <at> debbugs.gnu.org; Thu, 28 Mar 2024 05:26:48 -0400
Received: from lists.gnu.org ([2001:470:142::17]:54736)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <chris@HIDDEN>) id 1rpm1w-00032j-JJ
for submit <at> debbugs.gnu.org; Thu, 28 Mar 2024 05:26:43 -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 <chris@HIDDEN>)
id 1rpm1p-0001zp-Sd
for guix-patches@HIDDEN; Thu, 28 Mar 2024 05:26:33 -0400
Received: from mx.kolabnow.com ([212.103.80.155])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <chris@HIDDEN>)
id 1rpm1n-0005Fn-4V
for guix-patches@HIDDEN; Thu, 28 Mar 2024 05:26:33 -0400
Received: from localhost (unknown [127.0.0.1])
by mx.kolabnow.com (Postfix) with ESMTP id E497F3085BE4
for <guix-patches@HIDDEN>; Thu, 28 Mar 2024 10:26:19 +0100 (CET)
Authentication-Results: ext-mx-out013.mykolab.com (amavis);
dkim=pass (4096-bit key) reason="pass (just generated, assumed good)"
header.d=kolabnow.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h=
content-transfer-encoding:content-type:content-type:mime-version
:message-id:date:date:subject:subject:from:from:received
:received:received; s=dkim20160331; t=1711617975; x=1713432376;
bh=D0q9NElmHBVy9BhsZ2feDtnEFIHh5PiBTrfZwoG12ZQ=; b=m1KqAw87R2xg
zYdK5Mt1ftXugWF1AWlXHxAXNoBZHOxKUVw/k3Yhjgugd4bLK87j5069NH6QeBSr
WThbeMgFm422EU7caBGGmLV3SLUicp1XIr2LtMcN59AkWffQN6Mk30Ig+5L2jU1e
Js3HKVHdErJf+/H/Io+jWvr3NQKiTgy7cJKT0+Tym579KCPzE8bf3QGEG23hmeI8
H/75paZ+y6Aj7VZ8NRWjttiNvphAVP2hbuBcOYJWTxu1UV3onumB4Sbr8eelj++g
ao6W4cC0vP+mK8kAezXYKcNhOL/tqJwZgkwCb7HHot4EuxhYLXg1HU6jaUoIU5G5
q+yCI8E4wKsc2b/gT6Lq41UwomvKXY391zRpu0ycV57XNHSjIuUElAAUtSlsYnHT
HZnEg2ZfwXJ+N7TK6GqMreVtI6y0YLeB7k9sSiG50QSJ2qMKLDNonnOZPLtP6xZH
zcLkJsc1ymHSd8Q9aVXb6co+tZnVP1LgTmxAG3AnRDDsej0m44cIkvuUPCQAOGa7
p7SFOV5Q4Hif139KRUaCzTVV2rzvUKThQ1gpx3tVOIApFgmlkGA+Exs6sP1UVeJK
q3ElNj5pHV0mM5t2K0V6287LK5wijbvBQlAe/zaly++U02+xPFYkHD0WtDQPOfr7
mh4qGrvjQHeLnKPMxsxgVBLhXCc1LIo=
X-Virus-Scanned: amavis at mykolab.com
X-Spam-Flag: NO
X-Spam-Score: -0.989
X-Spam-Level:
X-Spam-Status: No, score=-0.989 tagged_above=-10 required=5
tests=[ALL_TRUSTED=-1, T_PDS_PRO_TLD=0.01, URIBL_BLOCKED=0.001]
autolearn=ham autolearn_force=no
Received: from mx.kolabnow.com ([127.0.0.1])
by localhost (ext-mx-out013.mykolab.com [127.0.0.1]) (amavis, port 10024)
with ESMTP id FytllDIydq0o for <guix-patches@HIDDEN>;
Thu, 28 Mar 2024 10:26:15 +0100 (CET)
Received: from int-mx009.mykolab.com (unknown [10.9.13.9])
by mx.kolabnow.com (Postfix) with ESMTPS id C02303085BE1
for <guix-patches@HIDDEN>; Thu, 28 Mar 2024 10:26:15 +0100 (CET)
Received: from ext-subm010.mykolab.com (unknown [10.9.6.10])
by int-mx009.mykolab.com (Postfix) with ESMTPS id 3CCF420D8CC9
for <guix-patches@HIDDEN>; Thu, 28 Mar 2024 10:26:15 +0100 (CET)
From: chris <chris@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: highlight: Update to 4.11.
Date: Thu, 28 Mar 2024 02:24:39 -0700
Message-ID: <2e0f9a03e955cc28f5b67e7edcc8680eed5bc587.1711617879.git.chris@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=212.103.80.155; envelope-from=chris@HIDDEN;
helo=mx.kolabnow.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_PDS_PRO_TLD=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: chris <chris@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* (highlight): Update to 4.11.
`guix lint highlight` moved the "arguments" nesting, otherwise few changes.
The source is changed to gitlab and the php not-found homepage url is changed
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 © 2022 Zhu Zihao <all_but_last@HIDDEN>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+;;; Copyright © 2024 chris <chris@HIDDEN>
;;;
;;; 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/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 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))))))))
(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,
base-commit: c2c1098585b10f42bed7647f2130a2727c0488f8
--
2.41.0
chris <chris@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70047; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.