[bug#65775] [PATCH 0/2] libvterm: Update to 0.3.3.

[bug#65775] [PATCH 0/2] libvterm: Update to 0.3.3.

[Zheng Junjie]

*** 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

[bug#65775] [PATCH 1/2] gnu: libvterm: Update to 0.3.3.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1968 bytes --]

* 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@dismail.de>
 ;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@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

[bug#65775] [PATCH 2/2] gnu: libvterm: Use Gexp.

[Zheng Junjie]

* 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

bug#65775: [PATCH 0/2] libvterm: Update to 0.3.3.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]


Zheng Junjie <zhengjunjie@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]