;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2017, 2018, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
(define-public xf86-video-nouveau
(package
(name "xf86-video-nouveau")
- (version "1.0.16")
+ (version "1.0.17")
(source
(origin
(method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-nouveau-"
- version
- ".tar.bz2"))
+ (uri (string-append "mirror://xorg/individual/driver/xf86-video-nouveau-"
+ version ".tar.bz2"))
(sha256
- (base32
- "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h"))))
+ (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"))))
(build-system gnu-build-system)
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
(license license:x11)))
-(define xkbcomp-intermediate ; used as input for xkeyboard-config
+(define xkbcomp-intermediate ;used as input for xkeyboard-config
(package
(name "xkbcomp-intermediate")
- (version "1.4.3")
+ (version "1.4.4")
(source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/app/xkbcomp-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0dflr250nlj6rrnv658f6dm8qx37sj0xfimc3ihay761kwb2q906"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/app/xkbcomp-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"))))
(build-system gnu-build-system)
(inputs
- `(("xorgproto" ,xorgproto)
- ("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)))
+ `(("xorgproto" ,xorgproto)
+ ("libxkbfile" ,libxkbfile)
+ ("libx11" ,libx11)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
(synopsis "Compile XKB keyboard description")
(description
(define-public xprop
(package
(name "xprop")
- (version "1.2.4")
+ (version "1.2.5")
(source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/app/xprop-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/app/xprop-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"))))
(build-system gnu-build-system)
(inputs
- `(("xorgproto" ,xorgproto)
- ("libx11" ,libx11)))
+ `(("libx11" ,libx11)
+ ("xorgproto" ,xorgproto)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
(synopsis "Display X server properties")
(description
;; This package is intended to be used when building GTK+.
;; Note: It's currently marked as "hidden" to avoid having two non-eq?
;; packages with the same name and version.
-;; TODO: Inherit source from xorg-server in a future rebuild cycle.
(define-public xorg-server-for-tests
(hidden-package
(package
- (inherit xorg-server)
- (version "1.20.9")
- (source (origin
- (inherit (package-source xorg-server))
- (uri (string-append "mirror://xorg/individual/xserver/"
- "xorg-server-" version ".tar.bz2"))
- (sha256
- (base32
- "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2")))))))
+ (inherit xorg-server))))
(define-public xorg-server-xwayland
(package/inherit xorg-server
(define-public libx11
(package
(name "libx11")
- (version "1.6.9")
- (replacement libx11/fixed)
+ (version "1.6.10")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1ldyn9c6pyx54sxzaw120n3q42rqi7b503aqmyjky6fn038fiiww"))))
+ "09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g"))))
+ (replacement libx11/fixed)
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;8 MiB of man pages + XML
(description "Xorg Core X11 protocol client library.")
(license license:x11)))
-(define libx11/fixed ; Fixes CVE-2020-14344
+(define-public libx11/fixed
(package
(inherit libx11)
- (version "1.6.A")
+ (version "1.6.12")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://xorg/individual/lib/libX11-1.6.10.tar.bz2"))
+ "mirror://xorg/individual/lib/libX11-"
+ version
+ ".tar.bz2"))
(sha256
(base32
- "09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g"))))))
+ "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"))))))
;; packages of height 5 in the propagated-inputs tree
(define-public xterm
(package
(name "xterm")
- (version "363")
+ (version "366")
(source
(origin
(method url-fetch)
(string-append "ftp://ftp.invisible-island.net/xterm/"
"xterm-" version ".tgz")))
(sha256
- (base32 "0j0bl5z3kmhahf770mbrj2zwm2nvxkhqpwnwbdvbclk5w8wkc6nq"))))
+ (base32 "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts"
"--enable-i18n" "--enable-doublechars"
"--enable-luit" "--enable-mini-luit")
- #:tests? #f))
+ #:tests? #f ; no test suite
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'patch-file-names
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "uxterm"
+ (("([ `\\|])(sh|sed|awk|xmessage) " _ prefix command)
+ (string-append prefix (which command) " "))
+ (("(`|\"|LANG=C )(locale) " _ prefix command)
+ (string-append prefix (which command) " "))
+ (("=xterm")
+ (string-append "=" out "/bin/xterm")))))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
license:bsd-3))))
(define-public uim-gtk
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-gtk")
(inputs
`(("gtk" ,gtk+)
(synopsis "Multilingual input method framework (GTK+ support)")))
(define-public uim-qt
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-qt")
(inputs
`(("qt" ,qtbase)
(define-public console-setup
(package
(name "console-setup")
- (version "1.197")
+ (version "1.201")
(source
(origin
(method git-fetch)
(url "https://salsa.debian.org/installer-team/console-setup.git")
(commit version)))
(sha256
- (base32 "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27"))
+ (base32 "0xkynb8d1813wph3p0sdvbpimx7zqkzh4c3mmqymp3pibcg7af5a"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
button and box, a treeview, an editbox, file and directory selectors, a range
box, and a calendar. It uses GTK+, and will match your desktop theme.")
(license license:gpl2+)))
+
+(define-public xvfb-run
+ (package
+ (name "xvfb-run")
+ (version "1.20.10-3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://debian/pool/main/x/xorg-server/"
+ "xorg-server_" version ".diff.gz"))
+ (sha256
+ (base32 "08gs9ni8ss8rw4n9cql1s8q05mj517vk1vm1varj1dsx75k4j25v"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ ;; Apply the source patch to an empty directory.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((source (assoc-ref inputs "source"))
+ (diff.gz (basename source))
+ (diff (substring diff.gz 0 (string-rindex diff.gz #\.))))
+ (mkdir "source")
+ (chdir "source")
+ (copy-file source diff.gz)
+ (invoke "gunzip" diff.gz)
+ (invoke "patch" "-Np1" "-i" diff)
+ (chdir "debian/local"))))
+ (delete 'configure) ; nothing to configure
+ (replace 'build
+ (lambda _
+ (chmod "xvfb-run" #o755)
+ (substitute* "xvfb-run"
+ (("(\\(| )(fmt|stty|awk|kill|getopt|mktemp|touch|rm|mcookie)"
+ _ prefix command)
+ (string-append prefix (which command)))
+ ;; These also feature in UI messages, so be more strict.
+ (("(AUTHFILE |command -v |exec )(Xvfb|xauth)"
+ _ prefix command)
+ (string-append prefix (which command))))))
+ (replace 'check
+ ;; There are no tests included. Here we test whether we can run
+ ;; a simple client without xvfb-run itself relying on $PATH.
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (let ((old-PATH (getenv "PATH"))
+ (xterm (which "xterm")))
+ (unsetenv "PATH")
+ (invoke "./xvfb-run" xterm "-e" "true")
+ (setenv "PATH" old-PATH)))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (man (string-append out "/share/man/man1")))
+ (install-file "xvfb-run" bin)
+ (install-file "xvfb-run.1" man)))))))
+ (inputs
+ `(("util-linux" ,util-linux) ; for getopt
+ ("xauth" ,xauth)
+ ("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("xterm" ,xterm))) ; for the test
+ ;; This script is not part of the upstream xorg-server. It is provided only
+ ;; as a patch added to Debian's package.
+ (home-page "https://packages.debian.org/sid/xorg-server-source")
+ (synopsis "Run X11 client or command in a virtual X server environment")
+ (description
+ "The @command{xvfb-run} wrapper simplifies running commands and scripts
+within a virtual X server environment. It sets up an X authority file or uses
+an existing user-specified one, writes a cookie to it, and then starts the
+@command{Xvfb} X server as a background process. It also takes care of killing
+the server and cleaning up before returning the exit status of the command.")
+ (license (list license:x11 ; the script
+ license:gpl2+)))) ; the man page
HCoop / jackhill / guix / guix.git / blobdiff