From 53e445c4634b88342c3fb92aecf0a2eb503ffcd9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 18 Jul 2021 21:29:01 -0400 Subject: gnu: libxscrnsaver: Propagate libx11 and libxext, as per pkg-config file. * gnu/packages/xorg.scm (libxscrnsaver)[inputs]: Move libx11 and libxext to ... [propagated-inputs]: ... here. --- gnu/packages/xorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6a7849f8c6..dcfe74b5bd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1517,11 +1517,10 @@ treat it as part of their software base when porting.") (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) - (inputs - `(("libxext" ,libxext) - ("libx11" ,libx11))) (propagated-inputs - `(("xorgproto" ,xorgproto))) + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From a4d9002bec35c4945df17e9650caa1a25804d633 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Tue, 20 Jul 2021 03:56:42 -0700 Subject: gnu: xpra: Update to 4.2.1. * gnu/packages/xorg.scm (xpra): Update to 4.2.1. Signed-off-by: Efraim Flashner --- 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 dcfe74b5bd..e3811d28a0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6329,14 +6329,14 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "4.2") + (version "4.2.1") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.gz")) (sha256 - (base32 "1yg9asi3i3wf73ibc006xv3g77axvbyp81lyinwq27syabh30i1a")) + (base32 "0gqdcw5cfk919jk8g0g4xjxbsvr5j9gskn8q3cmrz388pvfvm8x7")) (patches (search-patches "xpra-4.2-systemd-run.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies -- cgit v1.2.3 From 1a4c7ddefe2a1c853fb99989e21f867e1965ec59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Jul 2021 21:16:09 +0300 Subject: gnu: xpra: Add bash-minimal. * gnu/packages/xorg.scm (xpra)[inputs]: Add bash-minimal. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e3811d28a0..537f07f2f5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6340,7 +6340,7 @@ basic eye-candy effects.") (patches (search-patches "xpra-4.2-systemd-run.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies - (inputs `( + (inputs `(("bash-minimal" ,bash-minimal) ; for wrap-program ;; Essential dependencies. ("libjpeg" ,libjpeg-turbo) ("libwebp" ,libwebp) -- cgit v1.2.3 From 2c1cdbb19bf752fb41db9a80bda867f9619541e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Jul 2021 22:19:12 +0300 Subject: gnu: xorg.scm: Add missing module import. This is a follow-up to 1a4c7ddefe2a1c853fb99989e21f867e1965ec59. * gnu/packages/xorg.scm: Add missing module import. --- gnu/packages/xorg.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 537f07f2f5..0830bd5b26 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) -- cgit v1.2.3 From 151c54609b74f27f6954768d72fdb67525b1f784 Mon Sep 17 00:00:00 2001 From: qblade Date: Fri, 26 Mar 2021 00:28:43 +0000 Subject: gnu: uim: Enable 'uim-fep' to support the use of uim in text terminal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (uim)[inputs]: add ncurses. Signed-off-by: 宋文武 --- gnu/packages/xorg.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0830bd5b26..6f9633985e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -6472,7 +6473,8 @@ X11 servers, Windows, or macOS.") `(("anthy" ,anthy) ("libedit" ,libedit) ("libxft" ,libxft) - ("m17n-lib" ,m17n-lib))) + ("m17n-lib" ,m17n-lib) + ("ncurses" ,ncurses))) (native-inputs `(("emacs" ,emacs-minimal) ("intltool" ,intltool) -- cgit v1.2.3