From cb505b27eb0c20b8546e24bab844a195c386d30e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 4 Mar 2019 13:47:26 +0100
Subject: gnu: xorg-server: Don't use NAME in source URI.

* gnu/packages/xorg.scm (xorg-server)[source](uri): Hard-code NAME.
---
 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 fcfb500854..d027f317c2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5093,7 +5093,7 @@ over Xlib, including:
         (method url-fetch)
         (uri (string-append
               "mirror://xorg/individual/xserver/"
-              name "-" version ".tar.bz2"))
+              "xorg-server-" version ".tar.bz2"))
         (sha256
          (base32
           "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))
-- 
cgit v1.2.3


From 248f651e77ed07d3650420850eca806d10761d20 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 4 Mar 2019 13:48:09 +0100
Subject: gnu: xorg-server: Update to 1.20.4.

* gnu/packages/xorg.scm (xorg-server): Update to 1.20.4.
(xorg-server-for-tests): Stay on version 1.20.3.
---
 gnu/packages/xorg.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d027f317c2..7350580b77 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org>
-;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -5087,7 +5087,7 @@ over Xlib, including:
 (define-public xorg-server
   (package
     (name "xorg-server")
-    (version "1.20.3")
+    (version "1.20.4")
     (source
       (origin
         (method url-fetch)
@@ -5096,7 +5096,7 @@ over Xlib, including:
               "xorg-server-" version ".tar.bz2"))
         (sha256
          (base32
-          "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))
+          "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"))
         (patches
          (list
           ;; See:
@@ -5218,7 +5218,16 @@ draggable titlebars and borders.")
 (define-public xorg-server-for-tests
   (hidden-package
    (package
-     (inherit xorg-server))))
+     (inherit xorg-server)
+     (version "1.20.3")
+     (source (origin
+               (inherit (package-source xorg-server))
+               (uri (string-append
+                     "mirror://xorg/individual/xserver/"
+                     "xorg-server-" version ".tar.bz2"))
+               (sha256
+                (base32
+                 "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")))))))
 
 (define-public xorg-server-xwayland
   (package
-- 
cgit v1.2.3


From 80893da589df84ff2a9b463dca001642f8278359 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 4 Mar 2019 22:32:40 +0100
Subject: gnu: xorg-server-for-tests: Update to 1.20.4.

* gnu/packages/xorg.scm (xorg-server-for-tests)[source, version]: Inherit.
---
 gnu/packages/xorg.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4fe1880c91..a79b4d473f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5218,16 +5218,7 @@ draggable titlebars and borders.")
 (define-public xorg-server-for-tests
   (hidden-package
    (package
-     (inherit xorg-server)
-     (version "1.20.3")
-     (source (origin
-               (inherit (package-source xorg-server))
-               (uri (string-append
-                     "mirror://xorg/individual/xserver/"
-                     "xorg-server-" version ".tar.bz2"))
-               (sha256
-                (base32
-                 "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")))))))
+     (inherit xorg-server))))
 
 (define-public xorg-server-xwayland
   (package
-- 
cgit v1.2.3