diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
| commit | 7716ccd59c0c17f9399d73abec05001b775d100b (patch) | |
| tree | 17a3f8cc7201f9deed0b3de8d5d597b892aaede3 /gnu/packages/xorg.scm | |
| parent | 86edcc53382c66be06165c62a3934d60ae7aabd8 (diff) | |
| parent | a35532f52df3ba3bc360346938aa90806cad493e (diff) | |
| download | guix-7716ccd59c0c17f9399d73abec05001b775d100b.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9255622ca2..3fd7de3442 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5066,7 +5066,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.19.3") + (version "1.19.4") (source (origin (method url-fetch) @@ -5075,9 +5075,9 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")) + "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda")) (patches - (cons + (list ;; See: ;; https://lists.fedoraproject.org/archives/list/devel@lists. ;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/ @@ -5089,9 +5089,7 @@ over Xlib, including: (sha256 (base32 "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) - (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")) - (search-patches "xorg-server-CVE-2017-10971.patch" - "xorg-server-CVE-2017-10972.patch"))))) + (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs `(("dri2proto" ,dri2proto) |