From ac9cc329fcfba3316af3b40e61608b2a09d19768 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:52:07 +0100 Subject: gnu: libevdev: Do not build the static library. * gnu/packages/xorg.scm (libevdev)[arguments]: Add #:configure-flags. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cd6c3218a8..2232be3df0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2386,7 +2386,8 @@ (define-public libevdev "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'configure 'pedantry (lambda _ ;; XXX: libevdev includes kernel headers, which causes this -- cgit v1.2.3 From b82464b36112ef2ce29bf050b2ff2c89eefbcae1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:52:28 +0100 Subject: gnu: libevdev: Update to 1.8.0. * gnu/packages/xorg.scm (libevdev): Update to 1.8.0. --- 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 2232be3df0..a2847bac6b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2375,7 +2375,7 @@ (define-public xextproto (define-public libevdev (package (name "libevdev") - (version "1.5.9") + (version "1.8.0") (source (origin (method url-fetch) @@ -2383,7 +2383,7 @@ (define-public libevdev name "-" version ".tar.xz")) (sha256 (base32 - "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) + "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static") -- cgit v1.2.3 From 7f8c5111fc5d6c1f27e7aaf4a1c2369e77f5f50d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 16:09:39 +0100 Subject: gnu: xkeyboard-config: Update to 2.29. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.29. [inputs]: Move GETTEXT-MINIMAL ... [native-inputs]: ... here. Add PERL and PYTHON. Remove INTLTOOL. --- gnu/packages/xorg.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a2847bac6b..2954ab5323 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3838,7 +3838,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.28") + (version "2.29") (source (origin (method url-fetch) @@ -3848,15 +3848,16 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "1kmxc8hdw4qpvdlzp4ag8ygl34lqhs6sn3pcz1sl0kn61xdv5bb9")))) + "00hqc8nykvy8c09b8vab64dcd0ij3n5klxjn6rl00q7hickpah8x")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gettext-minimal) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("xkbcomp-intermediate" ,xkbcomp-intermediate))) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB configuration files") (description -- cgit v1.2.3 From acf6168b5dd1d5f03ad22966b27540d4457d2863 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 13:18:17 +0530 Subject: gnu: uim: Do not install elisp files in guix.d. * gnu/packages/xorg.scm (uim)[arguments]: Pass %output/share/emacs to the --with-lispdir configure flag. Add fix-install-path phase after install phase. --- gnu/packages/xorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f951e565ff..a7ba6fe9eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017 John Darrington ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov @@ -6137,8 +6137,7 @@ (define-public uim (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output - "/share/emacs/site-lisp/guix.d") + (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases @@ -6151,8 +6150,17 @@ (define-public uim (string-append "\"" (assoc-ref outputs "out") "/bin/" executable "\""))) #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 'install 'make-autoloads + (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From d5b0aa99f8d339b13dbea504bdb9a230e59915a0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 22:06:06 +0530 Subject: gnu: uim: Use emacs-substitute-variables instead of substitute*. * gnu/packages/xorg.scm (uim)[arguments]: In the configure-uim-el phase, use emacs-substitute-variables instead of substitute*. --- gnu/packages/xorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a7ba6fe9eb..2bf920b20d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6145,10 +6145,10 @@ (define-public uim ;; Set path of uim-el-agent and uim-el-helper-agent executables (add-after 'configure 'configure-uim-el (lambda* (#:key outputs #:allow-other-keys) - (substitute* "emacs/uim-var.el" - (("\"(uim-el-agent|uim-el-helper-agent)\"" _ executable) - (string-append "\"" (assoc-ref outputs "out") - "/bin/" executable "\""))) + (let ((out (assoc-ref outputs "out"))) + (emacs-substitute-variables "emacs/uim-var.el" + ("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 -- cgit v1.2.3