GNU bug report logs - #65775
[PATCH 0/2] libvterm: Update to 0.3.3.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65775 in the body.
You can then email your comments to 65775 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] libvterm: Update to 0.3.3.
Date: Wed,  6 Sep 2023 16:48:46 +0800

*** BLURB HERE ***

Zheng Junjie (2):
  gnu: libvterm: Update to 0.3.3.
  gnu: libvterm: Use Gexp.

 gnu/packages/terminals.scm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)


base-commit: 6113e0529d61df7425f64e30a6bf77f7cfdfe5a5
-- 
2.41.0

Message #8 received at 65775 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 65775 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: libvterm: Update to 0.3.3.
Date: Wed,  6 Sep 2023 16:55:39 +0800

* gnu/packages/terminals.scm (libvterm): Update to 0.3.3.
[source]: use launchpad.net url.
[arguments]: use CC-FOR-TARGET.
---
 gnu/packages/terminals.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 43aeac9fd7..690d9d5473 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello <at> foundationdevices.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -629,19 +630,25 @@ (define-public unibilium
 (define-public libvterm
   (package
     (name "libvterm")
-    (version "0.3.1")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://www.leonerd.org.uk/code/libvterm/"
-                           "libvterm-" version ".tar.gz"))
+       (uri (string-append
+             "https://launchpad.net/libvterm/trunk/v"
+             (version-major+minor version)
+             "/+download/libvterm-" version ".tar.gz"))
        (sha256
-        (base32 "15y3y23kfpcda7n79ym3gp1abzn8mshxrad8s3gnhls82nfava15"))))
+        (base32 "1q16fbznm54p24hqvw8c9v3347apk86ybsxyghsbsa11vm1ny589"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       (list "CC=gcc"
-             (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       (list
+        ;; FIXME: cross build is fail.
+        ;; ld: src/.libs/encoding.o: error adding symbols: file in wrong format
+        ;; collect2: error: ld returned 1 exit status
+        (string-append "CC=" ,(cc-for-target))
+        (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:test-target "test"
        #:phases
        (modify-phases %standard-phases
-- 
2.41.0

Message #11 received at 65775 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 65775 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: libvterm: Use Gexp.
Date: Wed,  6 Sep 2023 16:55:40 +0800

* gnu/packages/terminals.scm (libvterm): Use Gexp.
[arguments]: Use Gexp.
---
 gnu/packages/terminals.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 690d9d5473..28cd735632 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -642,17 +642,17 @@ (define-public libvterm
         (base32 "1q16fbznm54p24hqvw8c9v3347apk86ybsxyghsbsa11vm1ny589"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list
-        ;; FIXME: cross build is fail.
-        ;; ld: src/.libs/encoding.o: error adding symbols: file in wrong format
-        ;; collect2: error: ld returned 1 exit status
-        (string-append "CC=" ,(cc-for-target))
-        (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list #:make-flags
+           #~(list
+              ;; FIXME: cross build is fail.
+              ;; ld: src/.libs/encoding.o: error adding symbols: file in wrong format
+              ;; collect2: error: ld returned 1 exit status
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "PREFIX=" #$output))
+           #:test-target "test"
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))))
     (native-inputs
      (list libtool perl))
     (home-page "https://www.leonerd.org.uk/code/libvterm/")
-- 
2.41.0

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 65775-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#65775] [PATCH 0/2] libvterm: Update to 0.3.3.
Date: Wed, 13 Sep 2023 10:12:45 +0100

[Message part 1 (text/plain, inline)]

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Zheng Junjie (2):
>   gnu: libvterm: Update to 0.3.3.
>   gnu: libvterm: Use Gexp.
>
>  gnu/packages/terminals.scm | 29 ++++++++++++++++++-----------
>  1 file changed, 18 insertions(+), 11 deletions(-)

Thanks for the patches, I've changed "Use Gexp" to "Update arguments
style", as I think that better describes what's being done.

I've pushed these to master as 79988ab742fdb8b13ab61269ed11c0144593f320.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.