From b520ad2781b7be1660adeccdc4f7ddc09e7f2b49 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:16:18 +0200 Subject: gnu: uim: Keep Emacs files in subdirectory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (uim)[arguments]<#:configure-flags>: Drop “--with-lispdir”. <#:phases>: Drop ‘fix-install-path’. Adjust ‘make-autoloads’ accordingly. --- gnu/packages/xorg.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f65ffa7476..bbaa432142 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6298,7 +6298,6 @@ (define-public uim (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "CFLAGS=-O2 -g -fcommon") @@ -6312,21 +6311,11 @@ (define-public uim ("uim-el-agent" (string-append out "/bin/uim-el-agent")) ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent")))) #t)) - ;; Fix installation path by renaming share/emacs/uim-el to - ;; share/emacs/site-lisp - (add-after 'install 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (let ((share-emacs (string-append (assoc-ref outputs "out") - "/share/emacs"))) - (rename-file (string-append share-emacs "/uim-el") - (string-append share-emacs "/site-lisp"))) - #t)) - ;; Generate emacs autoloads for uim.el (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) + "/share/emacs/site-lisp/uim-el")) #t))))) (home-page "https://github.com/uim/uim") (synopsis "Multilingual input method framework") -- cgit v1.2.3 From 7dfb3155fc4dd37bea93a8704c37e4aff87e5013 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Mar 2024 08:08:33 +0200 Subject: gnu: xterm: Update to 390. * gnu/packages/xorg.scm (xterm): Update to 390. Change-Id: I136f0ad8670642a9afec3811b47138e360f34f3a --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ddbbdb74ba..a8a67b9270 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel -;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner +;;; Copyright © 2016, 2017, 2019-2024 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven @@ -5959,7 +5959,7 @@ (define-public xmessage (define-public xterm (package (name "xterm") - (version "384") + (version "390") (source (origin (method url-fetch) @@ -5969,7 +5969,7 @@ (define-public xterm (string-append "ftp://ftp.invisible-island.net/xterm/" "xterm-" version ".tgz"))) (sha256 - (base32 "0wy3rdj5smis44nsy6iccx3gsyzlqw0rcjjb7h605bnf803qgvri")) + (base32 "03wwdwnpj5dg1ah5sfp00ppzawjd81lnw47g4p20jjhpqly7q4bm")) (patches (search-patches "xterm-370-explicit-xcursor.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From e8dba8afffeb5cfc832b4898afbe1df2470450bf Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Apr 2024 15:45:56 -0400 Subject: gnu: xorg-server-xwayland: Update to 23.2.5 [security fixes]. Fixes CVE-2024-31080, CVE-2024-31081, and CVE-2024-31083. See the X.Org Security Advisory, , for details. * gnu/packages/xorg.scm (xorg-server-xwayland): Update to 23.2.5. Change-Id: I8d6b8f65bb6d06374a1ea925b5ff2a399a3efeac --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c2bf7dac58..b6694b3966 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen -;;; Copyright © 2023 John Kehayias +;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2023, 2024 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. @@ -5274,7 +5274,7 @@ (define-public egl-wayland (define-public xorg-server-xwayland (package (name "xorg-server-xwayland") - (version "23.2.4") + (version "23.2.5") (source (origin (method url-fetch) @@ -5282,7 +5282,7 @@ (define-public xorg-server-xwayland "/xserver/xwayland-" version ".tar.xz")) (sha256 (base32 - "0sxlh43cnpf56p2p5jnhp7427knfpy42mcka7f5hjcqddndib7m9")))) + "145xykwmyqkaa8zrbn5fnvnff67iral9mc5raamglnbsd3r7zv1k")))) (inputs (list font-dejavu dbus egl-wayland -- cgit v1.2.3 From 9b560fee239a7fd563e05ca9926b178f15954833 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Apr 2024 17:42:59 -0400 Subject: gnu: xorg-server: Update to 21.1.12 [security fixes]. Fixes CVE-2024-31080, CVE-2024-31081, CVE-2024-31081, and CVE-2024-31083. See the X.Org Security Advisory, , for details. * gnu/packages/xorg.scm (xorg-server): Update to 21.1.12. Change-Id: I384b91344f122f02e6261e2061bc45439cb03f7c --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b6694b3966..81d8462761 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5018,7 +5018,7 @@ (define-public libxcvt (define-public xorg-server (package (name "xorg-server") - (version "21.1.11") + (version "21.1.12") (source (origin (method url-fetch) @@ -5026,7 +5026,7 @@ (define-public xorg-server "/xserver/xorg-server-" version ".tar.xz")) (sha256 (base32 - "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x")) + "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y")) (patches (list ;; See: -- cgit v1.2.3 From 83a2ff488ded9757ea34cdb04a41ad5867305c0d Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Fri, 12 Apr 2024 21:53:06 -0700 Subject: gnu: xpra: Update to 5.0.8. * gnu/packages/xorg.scm (xpra): Updatw to 5.0.8. Change-Id: I6107d5c3469ca0576c668d1a68bf1148b8f055b6 Signed-off-by: Christopher Baines --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 81d8462761..74059a2691 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6157,14 +6157,14 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "5.0.7") + (version "5.0.8") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0rkcsv0b55xbvkqi38nm01yxc09f7l9nj7xnp8v23rn6bp86m8mr")) + (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) (patches (search-patches "xpra-5.0-systemd-run.patch" "xpra-5.0-install_libs.patch")))) (build-system python-build-system) -- cgit v1.2.3