GNU bug report logs - #64263
[PATCH 0/3] Update rxvt-unicode

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 64263 in the body.
You can then email your comments to 64263 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: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 0/3] Update rxvt-unicode
Date: Sat, 24 Jun 2023 13:25:17 +0200

Hi,

these patches update and simplify the rxvt-unicode package.

Thanks!

Timotej Lazar (3):
  gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170].
  gnu: rxvt-unicode: Use new package style.
  gnu: rxvt-unicode: Use helper procedure to make desktop files.

 gnu/packages/xdisorg.scm | 66 +++++++++++++---------------------------
 1 file changed, 21 insertions(+), 45 deletions(-)


base-commit: d6dc82e8cdb2d6114a12b06d449ce7f1150c7f70
-- 
2.40.1

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 64263 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 1/3] gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170].
Date: Sat, 24 Jun 2023 13:28:03 +0200

* gnu/packages/xdisorg.scm (rxvt-unicode): Update to 9.31.
[inputs]: Add libxext.
---
 gnu/packages/xdisorg.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index cdd5a48259..78bde1c5f4 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1271,14 +1271,14 @@ (define-public sxhkd
 (define-public rxvt-unicode
   (package
     (name "rxvt-unicode")
-    (version "9.30")
+    (version "9.31")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://dist.schmorp.de/rxvt-unicode/Attic/"
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"))))
+                "1s3jcvac40zzp03fvmhjsdpsjx0gb1wk54qz74zhzzj9q75kz8da"))))
     (build-system gnu-build-system)
     (arguments
      ;; This sets the destination when installing the necessary terminal
@@ -1328,7 +1328,8 @@ (define-public rxvt-unicode
      `(("libptytty" ,libptytty)
        ("libXft" ,libxft)
        ("libX11" ,libx11)
-       ("libXt" ,libxt)))
+       ("libXt" ,libxt)
+       ("libxext" ,libxext)))
     (native-inputs
      (list ncurses ;trigger the installation of terminfo data
            perl pkg-config))
-- 
2.40.1

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 64263 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/3] gnu: rxvt-unicode: Use new package style.
Date: Sat, 24 Jun 2023 13:28:04 +0200

* gnu/packages/xdisorg.scm (rxvt-unicode)[arguments]: Use gexps.
[inputs]: Drop input labels.
---
 gnu/packages/xdisorg.scm | 78 ++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 78bde1c5f4..ed642e7ce6 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1284,52 +1284,44 @@ (define-public rxvt-unicode
      ;; This sets the destination when installing the necessary terminal
      ;; capability data, which are not provided by 'ncurses'.  See
      ;; https://lists.gnu.org/archive/html/bug-ncurses/2009-10/msg00031.html
-     `(#:configure-flags (list "--enable-256-color")
-       #:make-flags (list (string-append "TERMINFO="
-                                         (assoc-ref %outputs "out")
-                                         "/share/terminfo"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-desktop-urxvt
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((output (assoc-ref outputs "out"))
-                    (desktop (string-append output "/share/applications")))
-               (mkdir-p desktop)
-               (with-output-to-file
-                   (string-append desktop "/urxvt.desktop")
+     (list #:configure-flags #~(list "--enable-256-color")
+           #:make-flags #~(list (string-append "TERMINFO=" #$output "/share/terminfo"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-desktop-urxvt
                  (lambda _
-                   (format #t
-                           "[Desktop Entry]~@
-                           Name=rxvt-unicode~@
-                           Comment=~@
-                           Exec=~a/bin/urxvt~@
-                           TryExec=~@*~a/bin/urxvt~@
-                           Icon=~@
-                           Type=Application~%"
-                           output))))))
-         (add-after 'install 'install-desktop-urxvtc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((output (assoc-ref outputs "out"))
-                    (desktop (string-append output "/share/applications")))
-               (mkdir-p desktop)
-               (with-output-to-file
-                   (string-append desktop "/urxvtc.desktop")
+                   (let ((desktop (string-append #$output "/share/applications")))
+                     (mkdir-p desktop)
+                     (with-output-to-file
+                         (string-append desktop "/urxvt.desktop")
+                       (lambda _
+                         (format #t
+                                 "[Desktop Entry]~@
+                                 Name=rxvt-unicode~@
+                                 Comment=~@
+                                 Exec=~a/bin/urxvt~@
+                                 TryExec=~@*~a/bin/urxvt~@
+                                 Icon=~@
+                                 Type=Application~%"
+                                 #$output))))))
+               (add-after 'install 'install-desktop-urxvtc
                  (lambda _
-                   (format #t
-                           "[Desktop Entry]~@
-                           Name=rxvt-unicode (client)~@
-                           Comment=Rxvt clone with XFT and unicode support~@
-                           Exec=~a/bin/urxvtc~@
-                           TryExec=~@*~a/bin/urxvtc~@
-                           Icon=~@
-                           Type=Application~%"
-                           output)))))))))
+                   (let ((desktop (string-append #$output "/share/applications")))
+                     (mkdir-p desktop)
+                     (with-output-to-file
+                         (string-append desktop "/urxvtc.desktop")
+                       (lambda _
+                         (format #t
+                                 "[Desktop Entry]~@
+                                 Name=rxvt-unicode (client)~@
+                                 Comment=Rxvt clone with XFT and unicode support~@
+                                 Exec=~a/bin/urxvtc~@
+                                 TryExec=~@*~a/bin/urxvtc~@
+                                 Icon=~@
+                                 Type=Application~%"
+                                 #$output)))))))))
     (inputs
-     `(("libptytty" ,libptytty)
-       ("libXft" ,libxft)
-       ("libX11" ,libx11)
-       ("libXt" ,libxt)
-       ("libxext" ,libxext)))
+     (list libptytty libxft libx11 libxt libxext))
     (native-inputs
      (list ncurses ;trigger the installation of terminfo data
            perl pkg-config))
-- 
2.40.1

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 64263 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 3/3] gnu: rxvt-unicode: Use helper procedure to make desktop
 files.
Date: Sat, 24 Jun 2023 13:28:05 +0200

* gnu/packages/xdisorg.scm (rxvt-unicode)[arguments]: Replace custom code with
make-desktop-entry-file. Specify categories and icon in desktop files.
---
 gnu/packages/xdisorg.scm | 45 +++++++++++++---------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index ed642e7ce6..2e31d49b0a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1288,38 +1288,21 @@ (define-public rxvt-unicode
            #:make-flags #~(list (string-append "TERMINFO=" #$output "/share/terminfo"))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'install 'install-desktop-urxvt
+               (add-after 'install 'install-desktop-entries
                  (lambda _
-                   (let ((desktop (string-append #$output "/share/applications")))
-                     (mkdir-p desktop)
-                     (with-output-to-file
-                         (string-append desktop "/urxvt.desktop")
-                       (lambda _
-                         (format #t
-                                 "[Desktop Entry]~@
-                                 Name=rxvt-unicode~@
-                                 Comment=~@
-                                 Exec=~a/bin/urxvt~@
-                                 TryExec=~@*~a/bin/urxvt~@
-                                 Icon=~@
-                                 Type=Application~%"
-                                 #$output))))))
-               (add-after 'install 'install-desktop-urxvtc
-                 (lambda _
-                   (let ((desktop (string-append #$output "/share/applications")))
-                     (mkdir-p desktop)
-                     (with-output-to-file
-                         (string-append desktop "/urxvtc.desktop")
-                       (lambda _
-                         (format #t
-                                 "[Desktop Entry]~@
-                                 Name=rxvt-unicode (client)~@
-                                 Comment=Rxvt clone with XFT and unicode support~@
-                                 Exec=~a/bin/urxvtc~@
-                                 TryExec=~@*~a/bin/urxvtc~@
-                                 Icon=~@
-                                 Type=Application~%"
-                                 #$output)))))))))
+                   (for-each (lambda (exec name)
+                               (make-desktop-entry-file
+                                (string-append #$output "/share/applications/"
+                                               exec ".desktop")
+                                #:type "Application"
+                                #:name name
+                                #:comment '((#f #$(package-synopsis this-package)))
+                                #:exec exec
+                                #:try-exec exec
+                                #:icon "utilities-terminal"
+                                #:categories '("System" "TerminalEmulator")))
+                             '("urxvt" "urxvtc")
+                             '("rxvt-unicode" "rxvt-unicode (client)")))))))
     (inputs
      (list libptytty libxft libx11 libxt libxext))
     (native-inputs
-- 
2.40.1

Message #19 received at 64263-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 64263-done <at> debbugs.gnu.org
Subject: Re: bug#64263: [PATCH 0/3] Update rxvt-unicode
Date: Tue, 11 Jul 2023 16:07:11 +0200

Timotej Lazar <timotej.lazar <at> araneo.si> skribis:

>   gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170].
>   gnu: rxvt-unicode: Use new package style.
>   gnu: rxvt-unicode: Use helper procedure to make desktop files.

Applied, thanks!

Previous Next

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