X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/af8fd11bed63af2ba97749fe7375880e0c5f0b20..f339df425eb00cb8d9418b3a338d7e03afd4a09c:/gnu/packages/xdisorg.scm diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d287ad9bc1..23ea19dec7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,15 +14,15 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2019 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Nils Gillmann -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marek Benc ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Thomas Sigurdsen -;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Nam Nguyen ;;; @@ -50,6 +50,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages documentation) @@ -62,6 +63,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -72,6 +74,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages linux) #:use-module (gnu packages gl) #:use-module (gnu packages guile) @@ -161,14 +164,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.8.2") + (version "0.8.4") (source (origin (method url-fetch) - (uri (string-append "https://xkbcommon.org/download/" name "-" + (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "136mdq11lrwg6rjmm44lmysxxgb9c35p4sq6k0cd129x82rw9f3s")))) + "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) @@ -299,7 +302,7 @@ following the mouse.") (source (origin (method url-fetch) (uri (string-append - "http://cairographics.org/releases/pixman-" + "https://www.cairographics.org/releases/pixman-" version ".tar.gz")) (sha256 (base32 @@ -321,7 +324,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.96") + (version "2.4.97") (source (origin (method url-fetch) @@ -331,7 +334,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd")) + "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments @@ -452,39 +455,24 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "0.8") - (source (origin - (method url-fetch) - (uri (list (string-append - "http://linuxbrit.co.uk/downloads/scrot-" - version ".tar.gz") - (string-append - "https://fossies.org/linux/privat/old/scrot-" - version ".tar.gz"))) - (sha256 - (base32 - "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1")))) + (version "0.9") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/resurrecting-open-source-projects/scrot.git") + (commit version))) + (sha256 + (base32 "1dg0pnmk09p7zlbyxv7d40vf54amrv73y976ds5p7096x6lmlndy")))) (build-system gnu-build-system) - (arguments - ;; By default, man and doc are put in PREFIX/{man,doc} instead of - ;; PREFIX/share/{man,doc}. - '(#:configure-flags - (list (string-append "--mandir=" - (assoc-ref %outputs "out") - "/share/man")) - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/scrot"))) - (mkdir-p doc) - (invoke "make" "install" - (string-append "docsdir=" doc)))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) (inputs - `(("libx11" ,libx11) - ("giblib" ,giblib))) - (home-page "http://linuxbrit.co.uk/software/") + `(("giblib" ,giblib) + ("libx11" ,libx11))) + (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") (description "Scrot allows to save a screenshot of a full screen, a window or a part @@ -638,6 +626,36 @@ to find buttons, etc, on the screen to click on.") (home-page "https://www.hoopajoo.net/projects/xautomation.html") (license license:gpl2+))) +(define-public xbanish + (package + (name "xbanish") + (version "1.6") + (home-page "https://github.com/jcs/xbanish") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("libx11" ,libx11) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxt" ,libxt))) + (synopsis "Banish the mouse cursor") + (description + "@command{xbanish} hides the mouse cursor when you start typing, and +shows it again when the mouse cursor moves or a mouse button is pressed.") + (license license:bsd-3))) + (define-public xlockmore (package (name "xlockmore") @@ -884,15 +902,15 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "0.31") + (version "0.32") (source (origin (method url-fetch) (uri (string-append "https://github.com/linuxwacom/libwacom/releases/download/" - name "-" version "/" name "-" version ".tar.bz2")) + "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "00xzkxhm0s9bvhbf27hscjbh17wa8lcgvxjqbmzm527f9cjqrm8q")))) + "102kz0q7i0bjsnl6yy83vcj2rpir12rs2d4xr0wvhw84rs5sp7bb")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -988,7 +1006,7 @@ color temperature should be set to match the lamps in your room.") (define-public xscreensaver (package (name "xscreensaver") - (version "5.40") + (version "5.42") (source (origin (method url-fetch) @@ -997,7 +1015,7 @@ color temperature should be set to match the lamps in your room.") version ".tar.gz")) (sha256 (base32 - "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h")))) + "1qfbsnj7201d03vf0b2lzxmlcq4kvkvzp48r5gcgsjr17c1sl7a4")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1011,7 +1029,9 @@ color temperature should be set to match the lamps in your room.") #t))) #:configure-flags '("--with-pam" "--with-proc-interrupts" "--without-readdisplay") - #:make-flags (list (string-append "AD_DIR=" + ;; FIXME: Remove CFLAGS once our default compiler is GCC6 or later. + #:make-flags (list "CFLAGS=-std=c99" + (string-append "AD_DIR=" (assoc-ref %outputs "out") "/usr/lib/X11/app-defaults")))) (native-inputs @@ -1103,7 +1123,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (define-public rofi (package (name "rofi") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/DaveDavenport/rofi/" @@ -1111,7 +1131,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") version "/rofi-" version ".tar.xz")) (sha256 (base32 - "0wx118banbwfqdwc5y44fkp3hxg97gj3vma16528slhy408hkg7i")))) + "17faa0rj8vqidrijwx9jrq0c29003n8v3izvc66yssfljgb8kcpj")))) (build-system gnu-build-system) (inputs `(("pango" ,pango) @@ -1609,4 +1629,29 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (synopsis "Set the color temperature of the screen") (description "@code{sct} is a lightweight utility to set the color temperature of the screen.") - (license license:bsd-3))) + (license (license:non-copyleft "file://sct.c")))) ; "OpenBSD" license + +(define-public wl-clipboard + (package + (name "wl-clipboard") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bugaevc/wl-clipboard.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03h6ajcc30w6928bkd4h6xfj4iy2359ww6hdlybq8mr1zwmb2h0q")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://github.com/bugaevc/wl-clipboard") + (synopsis "Command-line copy/paste utilities for Wayland") + (description "Wl-clipboard is a set of command-line copy/paste utilities for +Wayland.") + (license license:gpl3+)))