gnu: r-heatplus: Update to 2.30.0.

[jackhill/guix/guix.git] / gnu / packages / xorg.scm

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c24df32..5d8b349 100644 (file)
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6,12 +6,12 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>

-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
+;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 ng0 <ng0@n0.is>

 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org>
 ;;; 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>
 ;;; 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>


@@ -104,23 +104,21 @@
   ;; License: x11, see COPYING
   (origin
     (method url-fetch)
   ;; License: x11, see COPYING
   (origin
     (method url-fetch)

-    (uri "mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2")
+    (uri "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2")

     (sha256
     (sha256

-     (base32
-      "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd"))))
+     (base32 "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"))))

 
 (define-public imake
   (package
     (name "imake")
 
 (define-public imake
   (package
     (name "imake")

-    (version "1.0.7")
+    (version "1.0.8")

     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://xorg/individual/util/imake-"
                           version ".tar.bz2"))
       (sha256
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://xorg/individual/util/imake-"
                           version ".tar.bz2"))
       (sha256

-       (base32
-        "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"))))
+       (base32 "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"))))

     (build-system gnu-build-system)
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (native-inputs
       `(("pkg-config" ,pkg-config)))


@@ -550,7 +548,7 @@ Resources file.")
     (synopsis "Xorg font aliases")
     (description
      "This package provides some common aliases for Xorg fonts.
     (synopsis "Xorg font aliases")
     (description
      "This package provides some common aliases for Xorg fonts.

-For example: '6x10', '9x15bold', etc.")
+For example: @code{6x10}, @code{9x15bold}, etc.")

     (license license:x11)))
 
 
     (license license:x11)))
 
 


@@ -1084,7 +1082,7 @@ synchronization between the X server and direct-rendering clients.")
 (define-public libfontenc
   (package
     (name "libfontenc")
 (define-public libfontenc
   (package
     (name "libfontenc")

-    (version "1.1.3")
+    (version "1.1.4")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1094,14 +1092,14 @@ synchronization between the X server and direct-rendering clients.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"))))
+            "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"))))

     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)
         ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)
         ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/lib/libfontenc")

     (synopsis "Xorg font encoding library")
     (description "Xorg font encoding library.")
     (license license:x11)))
     (synopsis "Xorg font encoding library")
     (description "Xorg font encoding library.")
     (license license:x11)))


@@ -1110,7 +1108,7 @@ synchronization between the X server and direct-rendering clients.")
 (define-public libfs
   (package
     (name "libfs")
 (define-public libfs
   (package
     (name "libfs")

-    (version "1.0.7")
+    (version "1.0.8")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1119,8 +1117,7 @@ synchronization between the X server and direct-rendering clients.")
                version
                ".tar.bz2"))
         (sha256
                version
                ".tar.bz2"))
         (sha256

-          (base32
-            "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"))))
+          (base32 "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"))))

     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)
     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)


@@ -1271,7 +1268,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
 (define-public libxcomposite
   (package
     (name "libxcomposite")
 (define-public libxcomposite
   (package
     (name "libxcomposite")

-    (version "0.4.4")
+    (version "0.4.5")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1281,7 +1278,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"))))
+            "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"))))

     (build-system gnu-build-system)
     (propagated-inputs
      ;; xcomposite.pc refers to all these.
     (build-system gnu-build-system)
     (propagated-inputs
      ;; xcomposite.pc refers to all these.


@@ -1360,7 +1357,7 @@ configuration files.")
 (define-public libxkbfile
   (package
     (name "libxkbfile")
 (define-public libxkbfile
   (package
     (name "libxkbfile")

-    (version "1.0.9")
+    (version "1.1.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1370,7 +1367,7 @@ configuration files.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"))))
+            "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"))))

     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)))
     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)))


@@ -1500,25 +1497,22 @@ treat it as part of their software base when porting.")
 (define-public libxxf86dga
   (package
     (name "libxxf86dga")
 (define-public libxxf86dga
   (package
     (name "libxxf86dga")

-    (version "1.1.4")
+    (version "1.1.5")

     (source
     (source

-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/lib/libXxf86dga-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://xorg/individual/lib/"
+                           "libXxf86dga-" version ".tar.bz2"))
+       (sha256
+        (base32 "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"))))

     (build-system gnu-build-system)
     (propagated-inputs
     (build-system gnu-build-system)
     (propagated-inputs

-      `(("xorgproto" ,xorgproto)))
+     `(("xorgproto" ,xorgproto)))

     (inputs
     (inputs

-      `(("libx11" ,libx11)
-        ("libxext" ,libxext)))
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)))

     (native-inputs
     (native-inputs

-      `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)))

     (home-page "https://www.x.org/wiki/")
     (synopsis "Xorg XFree86-DGA library")
     (description "Client library for the XFree86-DGA extension.")
     (home-page "https://www.x.org/wiki/")
     (synopsis "Xorg XFree86-DGA library")
     (description "Client library for the XFree86-DGA extension.")


@@ -1560,7 +1554,7 @@ input from UTF-8 into the locale's encoding.")
 (define-public makedepend
   (package
     (name "makedepend")
 (define-public makedepend
   (package
     (name "makedepend")

-    (version "1.0.5")
+    (version "1.0.6")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1570,7 +1564,7 @@ input from UTF-8 into the locale's encoding.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"))))
+            "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"))))

     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)))
     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)))


@@ -1585,7 +1579,7 @@ input from UTF-8 into the locale's encoding.")
 (define-public mkfontscale
   (package
     (name "mkfontscale")
 (define-public mkfontscale
   (package
     (name "mkfontscale")

-    (version "1.1.3")
+    (version "1.2.1")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1594,8 +1588,7 @@ input from UTF-8 into the locale's encoding.")
                version
                ".tar.bz2"))
         (sha256
                version
                ".tar.bz2"))
         (sha256

-          (base32
-            "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"))))
+          (base32 "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"))))

     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)
     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)


@@ -1607,8 +1600,8 @@ input from UTF-8 into the locale's encoding.")
     (home-page "https://www.x.org/wiki/")
     (synopsis "Create an index of scalable font files for X server")
     (description
     (home-page "https://www.x.org/wiki/")
     (synopsis "Create an index of scalable font files for X server")
     (description

-     "MkFontScale creates the 'fonts.scale' and 'fonts.dir' index files used
-by the legacy X11 font system.")
+     "MkFontScale creates the @code{fonts.scale} and @code{fonts.dir} index
+files used by the legacy X11 font system.")

     (license license:x11)))
 
 
     (license license:x11)))
 
 


@@ -1970,7 +1963,7 @@ server.")
 (define-public x11perf
   (package
     (name "x11perf")
 (define-public x11perf
   (package
     (name "x11perf")

-    (version "1.6.0")
+    (version "1.6.1")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -1980,7 +1973,7 @@ server.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"))))
+            "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"))))

     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)
     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)


@@ -2083,17 +2076,14 @@ legacy X clients.")
 (define-public xcalc
   (package
     (name "xcalc")
 (define-public xcalc
   (package
     (name "xcalc")

-    (version "1.0.6")
+    (version "1.0.7")

     (source
      (origin
        (method url-fetch)
     (source
      (origin
        (method url-fetch)

-       (uri (string-append
-             "mirror://xorg/individual/app/" name "-"
-             version
-             ".tar.gz"))
+       (uri (string-append "mirror://xorg/individual/app/"
+                           "xcalc-" version ".tar.gz"))

        (sha256
        (sha256

-        (base32
-         "1lg8xwj0nr8anbd77n3cs87s57sr4gmb3pxs3k22a28n6ndcvmbz"))))
+        (base32 "1xgih1iq9498m7vk22qrdsck1rb905sn395azjn4a6pmhfai401b"))))

     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases


@@ -2230,7 +2220,7 @@ X11 Inter-Client Communication Conventions Manual (ICCCM).")
     (synopsis "Default Xorg cursors")
     (description
      "This package provides a default set of cursor themes for the Xorg
     (synopsis "Default Xorg cursors")
     (description
      "This package provides a default set of cursor themes for the Xorg

-X server: 'handhelds', 'redglass' and 'whiteglass'.")
+X server: @code{handhelds}, @code{redglass} and @code{whiteglass}.")

     (license license:x11)))
 
 
     (license license:x11)))
 
 


@@ -2331,7 +2321,7 @@ DRI (Direct Rendering Infrastructure) drivers.")
 (define-public xev
   (package
     (name "xev")
 (define-public xev
   (package
     (name "xev")

-    (version "1.2.2")
+    (version "1.2.3")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -2341,7 +2331,7 @@ DRI (Direct Rendering Infrastructure) drivers.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"))))
+            "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"))))

     (build-system gnu-build-system)
     (inputs
       `(("libxrender" ,libxrender)
     (build-system gnu-build-system)
     (inputs
       `(("libxrender" ,libxrender)


@@ -2350,7 +2340,7 @@ DRI (Direct Rendering Infrastructure) drivers.")
         ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
         ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xev")

     (synopsis "Print contents of X events")
     (description
      "XEv creates a window and then asks the X server to send it X11
     (synopsis "Print contents of X events")
     (description
      "XEv creates a window and then asks the X server to send it X11


@@ -2627,17 +2617,14 @@ as USB mice.")
 (define-public xf86-video-amdgpu
   (package
     (name "xf86-video-amdgpu")
 (define-public xf86-video-amdgpu
   (package
     (name "xf86-video-amdgpu")

-    (version "18.1.0")
+    (version "19.0.1")

     (source
     (source

-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/driver/xf86-video-amdgpu-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-           "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://xorg/individual/driver/"
+                           "xf86-video-amdgpu-" version ".tar.bz2"))
+       (sha256
+        (base32 "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da"))))

     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))


@@ -2697,17 +2684,14 @@ X server.")
 (define-public xf86-video-ati
   (package
     (name "xf86-video-ati")
 (define-public xf86-video-ati
   (package
     (name "xf86-video-ati")

-    (version "18.0.1")
+    (version "19.0.1")

     (source
     (source

-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/driver/xf86-video-ati-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://xorg/individual/driver/"
+                           "xf86-video-ati-" version ".tar.bz2"))
+       (sha256
+        (base32 "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw"))))

     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)


@@ -2908,7 +2892,7 @@ X server.")
 (define-public xf86-video-i128
   (package
     (name "xf86-video-i128")
 (define-public xf86-video-i128
   (package
     (name "xf86-video-i128")

-    (version "1.3.6")
+    (version "1.4.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -2918,8 +2902,7 @@ X server.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-           "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"))
-        (patches (search-patches "xf86-video-i128-remove-mibstore.patch"))))
+           "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"))))

     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))


@@ -2932,8 +2915,8 @@ X server.")
 
 
 (define-public xf86-video-intel
 
 
 (define-public xf86-video-intel

-  (let ((commit "0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c")
-        (revision "11"))
+  (let ((commit "6afed33b2d673d88674f0c76efe500ae414e8e1b")
+        (revision "13"))

     (package
       (name "xf86-video-intel")
       (version (git-version "2.99.917" revision commit))
     (package
       (name "xf86-video-intel")
       (version (git-version "2.99.917" revision commit))


@@ -2946,7 +2929,7 @@ X server.")
                (commit commit)))
          (sha256
           (base32
                (commit commit)))
          (sha256
           (base32

-           "10pqxp7n53ddiypd3l1i9gkbgzdpi6rz9vksbd16biq7pbijc2xf"))
+           "1s3fqlqzmql7s15m7qy21vai93n6q9f0ccpv0p353rwfx16mmf35"))

          (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (inputs `(("mesa" ,mesa)
          (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (inputs `(("mesa" ,mesa)


@@ -3015,7 +2998,7 @@ the same level of support for generic VGA or 8514/A adapters.")
 (define-public xf86-video-mga
   (package
     (name "xf86-video-mga")
 (define-public xf86-video-mga
   (package
     (name "xf86-video-mga")

-    (version "1.6.5")
+    (version "2.0.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -3025,7 +3008,7 @@ the same level of support for generic VGA or 8514/A adapters.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-           "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"))))
+           "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"))))

     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)


@@ -3355,7 +3338,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
 (define-public xf86-video-tdfx
   (package
     (name "xf86-video-tdfx")
 (define-public xf86-video-tdfx
   (package
     (name "xf86-video-tdfx")

-    (version "1.4.7")
+    (version "1.5.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -3365,7 +3348,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-           "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"))))
+           "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"))))

     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)


@@ -3652,7 +3635,7 @@ monitor via the X video mode extension.")
 (define-public xhost
   (package
     (name "xhost")
 (define-public xhost
   (package
     (name "xhost")

-    (version "1.0.7")
+    (version "1.0.8")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -3662,7 +3645,7 @@ monitor via the X video mode extension.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"))))
+            "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"))))

     (build-system gnu-build-system)
     (inputs
       `(("libxmu" ,libxmu)
     (build-system gnu-build-system)
     (inputs
       `(("libxmu" ,libxmu)


@@ -3670,7 +3653,7 @@ monitor via the X video mode extension.")
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xhost")

     (synopsis "Xorg server access control utility")
     (description
      "XHost is used to manage the list of host names or user names
     (synopsis "Xorg server access control utility")
     (description
      "XHost is used to manage the list of host names or user names


@@ -3856,7 +3839,7 @@ extension to the X11 protocol.  It includes:
 (define-public xkeyboard-config
   (package
     (name "xkeyboard-config")
 (define-public xkeyboard-config
   (package
     (name "xkeyboard-config")

-    (version "2.24")
+    (version "2.26")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -3866,7 +3849,7 @@ extension to the X11 protocol.  It includes:
               ".tar.bz2"))
         (sha256
           (base32
               ".tar.bz2"))
         (sha256
           (base32

-            "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"))))
+            "13h3381pfp4pv32189zkfsj2x0alr91xj6dqii76rl0c8v3ihdrr"))))

     (build-system gnu-build-system)
     (inputs
       `(("gettext" ,gettext-minimal)
     (build-system gnu-build-system)
     (inputs
       `(("gettext" ,gettext-minimal)


@@ -3881,7 +3864,7 @@ extension to the X11 protocol.  It includes:
      "xkeyboard-config provides a database for X Keyboard (XKB) Extension.
 There are five components that define a complete keyboard mapping:
 symbols, geometry, keycodes, compat, and types; these five components
      "xkeyboard-config provides a database for X Keyboard (XKB) Extension.
 There are five components that define a complete keyboard mapping:
 symbols, geometry, keycodes, compat, and types; these five components

-can be combined together using the 'rules' component of this database.")
+can be combined together using the @code{rules} component of this database.")

     (license license:x11)))
 
 
     (license license:x11)))
 
 


@@ -3917,7 +3900,7 @@ programs that have displayed undesired windows on a user's screen.")
 (define-public xlsatoms
   (package
     (name "xlsatoms")
 (define-public xlsatoms
   (package
     (name "xlsatoms")

-    (version "1.1.2")
+    (version "1.1.3")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -3927,13 +3910,13 @@ programs that have displayed undesired windows on a user's screen.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"))))
+            "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"))))

     (build-system gnu-build-system)
     (inputs
       `(("libxcb" ,libxcb)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs
       `(("libxcb" ,libxcb)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xlsatoms")

     (synopsis "List interned X server atoms")
     (description
      "XLsAtoms is used to list the interned atoms defined on X server.")
     (synopsis "List interned X server atoms")
     (description
      "XLsAtoms is used to list the interned atoms defined on X server.")


@@ -4029,7 +4012,7 @@ Font Description (XLFD) full name for a font.")
 (define-public xfd
   (package
     (name "xfd")
 (define-public xfd
   (package
     (name "xfd")

-    (version "1.1.2")
+    (version "1.1.3")

     (source (origin
               (method url-fetch)
               (uri (string-append
     (source (origin
               (method url-fetch)
               (uri (string-append


@@ -4037,7 +4020,7 @@ Font Description (XLFD) full name for a font.")
                     version ".tar.bz2"))
               (sha256
                (base32
                     version ".tar.bz2"))
               (sha256
                (base32

-                "0n97iqqap9wyxjan2n520vh4rrf5bc0apsw2k9py94dqzci258y1"))))
+                "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"))))

     (build-system gnu-build-system)
     (arguments
        `(#:configure-flags
     (build-system gnu-build-system)
     (arguments
        `(#:configure-flags


@@ -4065,7 +4048,7 @@ containing one glyph per cell.")
 (define-public xmodmap
   (package
     (name "xmodmap")
 (define-public xmodmap
   (package
     (name "xmodmap")

-    (version "1.0.9")
+    (version "1.0.10")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -4075,15 +4058,14 @@ containing one glyph per cell.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"))
-        (patches (search-patches "xmodmap-asprintf.patch"))))
+            "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"))))

     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xmodmap")

     (synopsis "Modify keymaps and button mappings on X server")
     (description
      "Xmodmap is used to display and edit the keyboard modifier map and
     (synopsis "Modify keymaps and button mappings on X server")
     (description
      "Xmodmap is used to display and edit the keyboard modifier map and


@@ -4158,7 +4140,7 @@ it for output on various types of printers.")
 (define-public xprop
   (package
     (name "xprop")
 (define-public xprop
   (package
     (name "xprop")

-    (version "1.2.3")
+    (version "1.2.4")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -4168,7 +4150,7 @@ it for output on various types of printers.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"))))
+            "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"))))

     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)
     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)


@@ -4215,7 +4197,7 @@ and Reflect (RandR) extension.")
 (define-public xrdb
   (package
     (name "xrdb")
 (define-public xrdb
   (package
     (name "xrdb")

-    (version "1.1.1")
+    (version "1.2.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -4225,14 +4207,14 @@ and Reflect (RandR) extension.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"))))
+            "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"))))

     (build-system gnu-build-system)
     (inputs
       `(("libxmu" ,libxmu)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
     (inputs
       `(("libxmu" ,libxmu)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xrdb")

     (synopsis "X server resource database utility")
     (description
      "XRDB is used to get or set the contents of the RESOURCE_MANAGER
     (synopsis "X server resource database utility")
     (description
      "XRDB is used to get or set the contents of the RESOURCE_MANAGER


@@ -4358,7 +4340,7 @@ libICE, the X font server, and related components.")
 (define-public xvinfo
   (package
     (name "xvinfo")
 (define-public xvinfo
   (package
     (name "xvinfo")

-    (version "1.1.3")
+    (version "1.1.4")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -4368,7 +4350,7 @@ libICE, the X font server, and related components.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"))))
+            "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"))))

     (build-system gnu-build-system)
     (inputs
       `(("libxext" ,libxext)
     (build-system gnu-build-system)
     (inputs
       `(("libxext" ,libxext)


@@ -4376,7 +4358,7 @@ libICE, the X font server, and related components.")
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/wiki/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xvinfo")

     (synopsis "Print out X-Video extension adaptor information")
     (description
      "XVInfo is used to print out the capabilities of any video adaptors
     (synopsis "Print out X-Video extension adaptor information")
     (description
      "XVInfo is used to print out the capabilities of any video adaptors


@@ -4764,7 +4746,7 @@ protocol and arbitrary X extension protocol.")
     (home-page "https://www.x.org/wiki/")
     (synopsis "Create an index of X font files in a directory")
     (description
     (home-page "https://www.x.org/wiki/")
     (synopsis "Create an index of X font files in a directory")
     (description

-     "MkFontDir creates the 'fonts.dir' files needed by the legacy X
+     "MkFontDir creates the @code{fonts.dir} files needed by the legacy X

 server core font system.  The current implementation is a simple wrapper
 script around the mkfontscale program.")
     (license license:x11)))
 server core font system.  The current implementation is a simple wrapper
 script around the mkfontscale program.")
     (license license:x11)))


@@ -4988,7 +4970,7 @@ new API's in libXft, or the legacy API's in libX11.")
 (define-public libxvmc
   (package
     (name "libxvmc")
 (define-public libxvmc
   (package
     (name "libxvmc")

-    (version "1.0.10")
+    (version "1.0.11")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -4998,7 +4980,7 @@ new API's in libXft, or the legacy API's in libX11.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"))))
+            "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"))))

     (build-system gnu-build-system)
     (propagated-inputs
       `(("libxv" ,libxv)))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("libxv" ,libxv)))


@@ -5092,16 +5074,16 @@ over Xlib, including:
 (define-public xorg-server
   (package
     (name "xorg-server")
 (define-public xorg-server
   (package
     (name "xorg-server")

-    (version "1.20.3")
+    (version "1.20.4")

     (source
       (origin
         (method url-fetch)
         (uri (string-append
               "mirror://xorg/individual/xserver/"
     (source
       (origin
         (method url-fetch)
         (uri (string-append
               "mirror://xorg/individual/xserver/"

-              name "-" version ".tar.bz2"))
+              "xorg-server-" version ".tar.bz2"))

         (sha256
          (base32
         (sha256
          (base32

-          "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))
+          "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"))

         (patches
          (list
           ;; See:
         (patches
          (list
           ;; See:


@@ -5150,8 +5132,8 @@ over Xlib, including:
         ("xcb-util-renderutil" ,xcb-util-renderutil)
         ("xcb-util-wm" ,xcb-util-wm)))
     (native-inputs
         ("xcb-util-renderutil" ,xcb-util-renderutil)
         ("xcb-util-wm" ,xcb-util-wm)))
     (native-inputs

-       `(("python" ,python-minimal-wrapper)
-         ("pkg-config" ,pkg-config)))
+     `(("python" ,python-wrapper)
+       ("pkg-config" ,pkg-config)))

     (arguments
      `(#:parallel-tests? #f
        #:configure-flags
     (arguments
      `(#:parallel-tests? #f
        #:configure-flags


@@ -5284,7 +5266,7 @@ draggable titlebars and borders.")
 (define-public libxcursor
   (package
     (name "libxcursor")
 (define-public libxcursor
   (package
     (name "libxcursor")

-    (version "1.1.15")
+    (version "1.2.0")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -5294,7 +5276,7 @@ draggable titlebars and borders.")
                ".tar.bz2"))
         (sha256
           (base32
                ".tar.bz2"))
         (sha256
           (base32

-            "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"))))
+            "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"))))

     (build-system gnu-build-system)
     (propagated-inputs
       `(("libx11" ,libx11)
     (build-system gnu-build-system)
     (propagated-inputs
       `(("libx11" ,libx11)


@@ -5668,14 +5650,14 @@ The XCB util-wm module provides the following libraries:
 (define-public xinit
   (package
     (name "xinit")
 (define-public xinit
   (package
     (name "xinit")

-    (version "1.4.0")
+    (version "1.4.1")

     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/app/xinit-"
                                   version ".tar.bz2"))
               (sha256
                (base32
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/app/xinit-"
                                   version ".tar.bz2"))
               (sha256
                (base32

-                "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"))))
+                "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"))))

     (build-system gnu-build-system)
     (inputs
      `(("xorgproto" ,xorgproto)
     (build-system gnu-build-system)
     (inputs
      `(("xorgproto" ,xorgproto)


@@ -5689,7 +5671,7 @@ The XCB util-wm module provides the following libraries:
     (description
      "The xinit program is used to start the X Window System server and a
 first client program on systems that are not using a display manager such as
     (description
      "The xinit program is used to start the X Window System server and a
 first client program on systems that are not using a display manager such as

-xdm.  This package also provides the 'startx' command, which provides a
+xdm.  This package also provides the @code{startx} command, which provides a

 user-friendly mechanism to start the X server.")
     (license license:x11)))
 
 user-friendly mechanism to start the X server.")
     (license license:x11)))
 


@@ -5728,14 +5710,14 @@ Intrinsics (Xt) Library.")
 (define-public xclock
   (package
     (name "xclock")
 (define-public xclock
   (package
     (name "xclock")

-    (version "1.0.7")
+    (version "1.0.8")

     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.x.org/releases/individual/app/"
                            name "-" version ".tar.bz2"))
        (sha256
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.x.org/releases/individual/app/"
                            name "-" version ".tar.bz2"))
        (sha256

-        (base32 "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"))))
+        (base32 "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k"))))

     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags


@@ -5750,7 +5732,7 @@ Intrinsics (Xt) Library.")
        ("libxkbfile" ,libxkbfile)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
        ("libxkbfile" ,libxkbfile)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))

-    (home-page "https://www.x.org/")
+    (home-page "https://gitlab.freedesktop.org/xorg/app/xclock")

     (synopsis "Analog / digital clock for X")
     (description "The xclock program displays the time in analog or digital
 form.")
     (synopsis "Analog / digital clock for X")
     (description "The xclock program displays the time in analog or digital
 form.")


@@ -5979,18 +5961,17 @@ Conventions Manual) and some of the @dfn{EWMH}
 (define-public xcompmgr
   (package
     (name "xcompmgr")
 (define-public xcompmgr
   (package
     (name "xcompmgr")

-    (version "1.1.7")
+    (version "1.1.8")

     (source
      (origin
     (source
      (origin

-       ;; there's no current tarball
+       ;; There's no current tarball.

        (method git-fetch)
        (uri (git-reference
              (url "https://anongit.freedesktop.org/git/xorg/app/xcompmgr.git")
        (method git-fetch)
        (uri (git-reference
              (url "https://anongit.freedesktop.org/git/xorg/app/xcompmgr.git")

-             (commit (string-append name "-" version))))
+             (commit (string-append "xcompmgr-" version))))

        (sha256
        (sha256

-        (base32
-         "04swkrm3gk689wrjc418bd3n25w8r20kg1xfbn5j8d7mx1r5gf16"))
-       (file-name (string-append name "-" version))))
+        (base32 "11i7vyk3pynw8q8aczpy56qncm84y0cmhlvyja3sj8dgy60g03q2"))
+       (file-name (git-file-name name version))))

     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases


@@ -6020,7 +6001,7 @@ basic eye-candy effects.")
 (define-public xpra
   (package
     (name "xpra")
 (define-public xpra
   (package
     (name "xpra")

-    (version "2.4.3")
+    (version "2.5.1")

     (source
      (origin
        (method url-fetch)
     (source
      (origin
        (method url-fetch)


@@ -6028,7 +6009,7 @@ basic eye-candy effects.")
                            version ".tar.xz"))
        (sha256
         (base32
                            version ".tar.xz"))
        (sha256
         (base32

-         "0pq2pzmv5fsafp50rzl9nb6ns08rl88fhgdqc2hh27dx7b8ka8n6"))))
+         "14l3bs7mlkd2lphjhnbw5dr95pg7x1k61s9wk35dra4li2xjy1lm"))))

     (build-system python-build-system)
     (inputs `(("ffmpeg" ,ffmpeg)
               ("flac" ,flac)
     (build-system python-build-system)
     (inputs `(("ffmpeg" ,ffmpeg)
               ("flac" ,flac)


@@ -6366,7 +6347,7 @@ output.")
 (define-public console-setup
   (package
     (name "console-setup")
 (define-public console-setup
   (package
     (name "console-setup")

-    (version "1.189")
+    (version "1.191")

     (source
      (origin
        (method git-fetch)
     (source
      (origin
        (method git-fetch)


@@ -6374,7 +6355,7 @@ output.")
              (url "https://salsa.debian.org/installer-team/console-setup.git")
              (commit version)))
        (sha256
              (url "https://salsa.debian.org/installer-team/console-setup.git")
              (commit version)))
        (sha256

-        (base32 "09rfnnhwjm98im711v6jrgl49iy5n1b26x12zzk5rw6g1667mz86"))
+        (base32 "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim"))

        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments


@@ -6386,6 +6367,15 @@ output.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)

+         (add-after 'unpack 'patch-file-names
+           (lambda _
+             ;; 'ckbcomp' calls out to 'cat' (!).  Give it the right file
+             ;; name.
+             (substitute* '("Keyboard/ckbcomp")
+               (("\"cat ")
+                (string-append "\"" (which "cat")
+                               " ")))
+             #t))

          (add-before 'build 'make-doubled-bdfs
            (lambda* (#:key inputs #:allow-other-keys)
              (invoke "make" "-C" "Fonts"
          (add-before 'build 'make-doubled-bdfs
            (lambda* (#:key inputs #:allow-other-keys)
              (invoke "make" "-C" "Fonts"