[bug#30763] [PATCH core-updates 00/27] Use xorgproto everywhere

[bug#30763] [PATCH core-updates 00/27] Use xorgproto everywhere

[Marius Bakke]

Hello!

As promised in
<https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00335.html>,
this patch series makes the "xorgproto" package supersede the various
X.org "-proto" packages that were previously distributed separately.

Marius Bakke (27):
  gnu: Switch from xproto to xorgproto.
  gnu: Switch from randrproto to xorgproto.
  gnu: Switch from bigreqsproto to xorgproto.
  gnu: Switch from xextproto to xorgproto.
  gnu: Switch from fixesproto to xorgproto.
  gnu: Switch from compositeproto to xorgproto.
  gnu: Switch from kbproto to xorgproto.
  gnu: Switch from inputproto to xorgproto.
  gnu: Switch from fontsproto to xorgproto.
  gnu: Switch from glproto to xorgproto.
  gnu: Switch from dmxproto to xorgproto.
  gnu: Switch from damageproto to xorgproto.
  gnu: Switch from dri2proto to xorgproto.
  gnu: Switch from dri3proto to xorgproto.
  gnu: Switch from videoproto to xorgproto.
  gnu: Switch from windowswmproto to xorgproto.
  gnu: Switch from xcmiscproto to xorgproto.
  gnu: Switch from presentproto to xorgproto.
  gnu: Switch from renderproto to xorgproto.
  gnu: Switch from resourceproto to xorgproto.
  gnu: Switch from recordproto to xorgproto.
  gnu: Switch from scrnsaverproto to xorgproto.
  gnu: Switch from xf86driproto to xorgproto.
  gnu: Switch from xf86dgaproto to xorgproto.
  gnu: Switch from xf86bigfontproto to xorgproto.
  gnu: Switch from xf86vidmodeproto to xorgproto.
  gnu: Switch from xineramaproto to xorgproto.

 gnu/packages/compton.scm          |   2 +-
 gnu/packages/enlightenment.scm    |   5 +-
 gnu/packages/gl.scm               |  11 +-
 gnu/packages/gnome.scm            |   2 +-
 gnu/packages/gtk.scm              |   2 +-
 gnu/packages/haskell.scm          |   2 +-
 gnu/packages/image-processing.scm |   2 +-
 gnu/packages/mate.scm             |  19 +-
 gnu/packages/ratpoison.scm        |   5 +-
 gnu/packages/tcl.scm              |   2 +-
 gnu/packages/video.scm            |   6 +-
 gnu/packages/xdisorg.scm          |   4 +-
 gnu/packages/xnee.scm             |   5 +-
 gnu/packages/xorg.scm             | 361 +++++++++++++++++---------------------
 14 files changed, 182 insertions(+), 246 deletions(-)

-- 
2.16.2

[bug#30763] [PATCH core-updates 01/27] gnu: Switch from xproto to xorgproto.

[Marius Bakke]

* gnu/packages/compton.scm (compton)[inputs]: Replace XPROTO with XORGPROTO.
* gnu/packages/enlightenment.scm (efl)[inputs]: Likewise.
* gnu/packages/gnome.scm (totem)[inputs]: Likewise.
* gnu/packages/haskell.scm (ghc-x11-xft)[inputs]: Likewise.
* gnu/packages/image-processing.scm (vtk)[inputs]: Likewise.
* gnu/packages/mate.scm (mate-control-center, mate-netbook, mate-screensaver,
mate-utils)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (imake, lndir, libxshmfence, libfontenc, libfs,
libxcomposite, libxdmcp, libxft, libxmu, libxpm, libxres, makedepend,
mkfontscale, sessreg, xev, xf86-video-qxl, xkbcomp-intermediate, xkbutils,
xlsfonts, xmodmap, xpr, xprop, xrandr, xset, xwd, xwininfo, xwud, xorg-rgb,
libxdamage, libxrender, libxv, libice, libxau, libxfixes, libxfont, libxi,
libxrandr, libxvmc, xorg-server, libxcursor, libxaw, twm, xinit,
xterm)[inputs]: Likewise.
(xorgproto): Move expression above all other proto packages.
(xproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/compton.scm          |   2 +-
 gnu/packages/enlightenment.scm    |   2 +-
 gnu/packages/gnome.scm            |   2 +-
 gnu/packages/haskell.scm          |   2 +-
 gnu/packages/image-processing.scm |   2 +-
 gnu/packages/mate.scm             |   8 +--
 gnu/packages/tcl.scm              |   2 +-
 gnu/packages/xdisorg.scm          |   2 +-
 gnu/packages/xnee.scm             |   2 +-
 gnu/packages/xorg.scm             | 136 +++++++++++++++++++-------------------
 10 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm
index 323807091..dec9a94eb 100644
--- a/gnu/packages/compton.scm
+++ b/gnu/packages/compton.scm
@@ -67,7 +67,7 @@
          ("libdrm" ,libdrm)
          ("pkg-config" ,pkg-config)
          ("python" ,python)
-         ("xproto" ,xproto)))
+         ("xorgproto" ,xorgproto)))
       (arguments
        `(#:make-flags (list
                        "CC=gcc"
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 8550a8964..81eacb433 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -113,7 +113,7 @@
        ("xextproto" ,xextproto)
        ("xinput" ,xinput)
        ("xpr" ,xpr)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (propagated-inputs
      ;; All these inputs are in package config files in section
      ;; Requires.private.
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2384bf238..20699af69 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3650,7 +3650,7 @@ for application developers.")
        ("clutter" ,clutter)
        ("clutter-gtk" ,clutter-gtk)
        ("clutter-gst" ,clutter-gst)
-       ("xproto" ,xproto)
+       ("xorgproto" ,xorgproto)
        ("libxxf86vm" ,libxxf86vm)
        ("libxtst" ,libxtst)
        ("libxrandr" ,libxrandr)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index e7401e5cf..c8112b11e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1821,7 +1821,7 @@ bindings are a direct translation of the C bindings.")
        ("ghc-utf8-string" ,ghc-utf8-string)
        ("libx11" ,libx11)
        ("libxft" ,libxft)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (build-system haskell-build-system)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 6705a726c..a44bc086d 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -164,7 +164,7 @@ of external libraries that provide additional functionality.")
        #:tests? #f))                              ;XXX: no "test" target
     (inputs
      `(("libXt" ,libxt)
-       ("xproto" ,xproto)
+       ("xorgproto" ,xorgproto)
        ("libX11" ,libx11)
        ("libxml2" ,libxml2)
        ("mesa" ,mesa)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 0281b02da..1faabd133 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -928,7 +928,7 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xextpro" ,xextproto)
-       ("xproto" ,xproto)
+       ("xorgproto" ,xorgproto)
        ("xmodmap" ,xmodmap)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
@@ -1142,7 +1142,7 @@ can be used as backgrounds in the MATE Desktop environment.")
        ("libxtst" ,libxtst)
        ("libx11" ,libx11)
        ("mate-panel" ,mate-panel)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (home-page "https://mate-desktop.org/")
     (synopsis "Tool for MATE on Netbooks")
     (description
@@ -1202,7 +1202,7 @@ Re-decorates windows on un-maximise.
        ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
        ("xextpro" ,xextproto)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (inputs
      `(("cairo" ,cairo)
        ("dconf" ,dconf)
@@ -1257,7 +1257,7 @@ can be used as backgrounds in the MATE Desktop environment.")
        ("pkg-config" ,pkg-config)
        ("scrollkeeper" ,scrollkeeper)
        ("xextpro" ,xextproto)
-       ("xproto" ,xproto)
+       ("xorgproto" ,xorgproto)
        ("yelp-tools" ,yelp-tools)))
     (inputs
      `(("atk" ,atk)
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 8988cdc3b..64b78e29b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -100,7 +100,7 @@
     (inputs
      `(;; TODO: Add these optional dependencies.
        ;; ("libX11" ,libX11)
-       ;; ("xproto" ,xproto)
+       ;; ("xorgproto" ,xorgproto)
        ;; ("tk" ,tk)
        ("tcl" ,tcl)))
     (arguments
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index a3630b3cb..8432503e3 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -629,7 +629,7 @@ things less distracting.")
     (native-inputs
      `(("inputproto" ,inputproto)
        ("xextproto" ,xextproto)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (synopsis "Tools to automate tasks in X such as detecting on screen images")
     (description
      "Xautomation can control X from the command line for scripts, and
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index fc5130c0e..36fc5b963 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -47,7 +47,7 @@
        ("libxtst" ,libxtst)
        ("recordproto" ,recordproto)
        ("xextproto" ,xextproto)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.gnu.org/software/xnee/")
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 46a9a3b85..26704e606 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -119,7 +119,7 @@
       `(("pkg-config" ,pkg-config)))
     (inputs
       `(("xorg-cf-files" ,xorg-cf-files)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -169,7 +169,7 @@ autotools system.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("xproto" ,xproto)))
+     `(("xorgproto" ,xorgproto)))
     (home-page "https://www.x.org/")
     (synopsis "Symlink directory into tree")
     (description "Create a shadow directory of symbolic links to another
@@ -203,6 +203,27 @@ converts X font from Bitmap Distribution Format to Portable Compiled Format
 which can be read by any architecture.")
     (license license:x11)))
 
+(define-public xorgproto
+  (package
+    (name "xorgproto")
+    (version "2018.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://xorg/individual/proto/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+     ;; To get util-macros in (almost?) all package inputs.
+     `(("util-macros" ,util-macros)))
+    (home-page "https://cgit.freedesktop.org/xorg/proto/xorgproto")
+    (synopsis "Xorg protocol headers")
+    (description
+     "This package provides the headers and specification documents defining
+the core protocol and (many) extensions for the X Window System.")
+    (license license:x11)))
 
 (define-public bigreqsproto
   (package
@@ -1039,7 +1060,7 @@ of new capabilities and controls for text keyboards.")
                 "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("xproto" ,xproto)))
+    (inputs `(("xorgproto" ,xorgproto)))
     (home-page "https://www.x.org/")
     (synopsis "Xorg shared memory fences library")
     (description
@@ -1067,7 +1088,7 @@ synchronization between the X server and direct-rendering clients.")
     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1093,7 +1114,7 @@ synchronization between the X server and direct-rendering clients.")
     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("fontsproto" ,fontsproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -1256,7 +1277,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
     (build-system gnu-build-system)
     (propagated-inputs
      ;; xcomposite.pc refers to all these.
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxfixes" ,libxfixes)
         ("libx11" ,libx11)
         ("compositeproto" ,compositeproto)))
@@ -1286,7 +1307,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
     (build-system gnu-build-system)
     (inputs
       `(("libbsd" ,libbsd)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1317,7 +1338,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
         ("fontconfig" ,fontconfig)))
     (inputs
       `(("libx11" ,libx11)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1371,7 +1392,7 @@ configuration files.")
     (build-system gnu-build-system)
     (inputs
       `(("libxt" ,libxt)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libxext" ,libxext)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -1404,7 +1425,7 @@ treat it as part of their software base when porting.")
     (inputs
       `(("gettext" ,gettext-minimal)
         ("libxt" ,libxt)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libxext" ,libxext)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -1430,7 +1451,7 @@ treat it as part of their software base when porting.")
             "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("resourceproto" ,resourceproto)))
@@ -1546,7 +1567,7 @@ input from UTF-8 into the locale's encoding.")
             "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
     (synopsis "Xorg makedepend utility")
@@ -1572,7 +1593,7 @@ input from UTF-8 into the locale's encoding.")
     (build-system gnu-build-system)
     (inputs
       `(("zlib" ,zlib)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("freetype" ,freetype)
         ("libfontenc" ,libfontenc)))
     (native-inputs
@@ -1771,7 +1792,7 @@ features and to query screensaver info on specific windows.")
             "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -2319,7 +2340,7 @@ DRI (Direct Rendering Infrastructure) drivers.")
     (inputs
       `(("libxrender" ,libxrender)
         ("libxrandr" ,libxrandr)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -3150,7 +3171,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
         ("spice-protocol" ,spice-protocol)
         ("xf86dgaproto" ,xf86dgaproto)
         ("xorg-server" ,xorg-server)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (synopsis "Qxl video driver for X server")
@@ -3720,7 +3741,7 @@ alternative implementations like XRandR or TwinView.")
           "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxkbfile" ,libxkbfile)
         ("libx11" ,libx11)))
     (native-inputs
@@ -3799,7 +3820,7 @@ requested commands if they occur.")
     (build-system gnu-build-system)
     (inputs
       `(("libxt" ,libxt)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libxaw" ,libxaw)
         ("inputproto" ,inputproto)))
     (native-inputs
@@ -3948,7 +3969,7 @@ running on X server.")
          "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"))))
     (build-system gnu-build-system)
     (inputs
-     `(("xproto" ,xproto)
+     `(("xorgproto" ,xorgproto)
        ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -4044,7 +4065,7 @@ containing one glyph per cell.")
         (patches (search-patches "xmodmap-asprintf.patch"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -4107,7 +4128,7 @@ refers to the included common xorg.css stylesheet.")
             "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxmu" ,libxmu)
         ("libx11" ,libx11)))
     (native-inputs
@@ -4136,7 +4157,7 @@ it for output on various types of printers.")
             "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -4165,7 +4186,7 @@ an X server.")
     (inputs
       `(("libxrender" ,libxrender)
         ("libxrandr" ,libxrandr)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -4252,7 +4273,7 @@ up your screen.")
             "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxmu" ,libxmu)
         ("libxext" ,libxext)
         ("libx11" ,libx11)))
@@ -4368,7 +4389,7 @@ extension.")
     (inputs
       `(("libxt" ,libxt)
         ("libxkbfile" ,libxkbfile)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4400,7 +4421,7 @@ dump and twice whenthe dump is completed.")
     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4427,7 +4448,7 @@ Various information is displayed depending on which options are selected.")
             "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
@@ -4454,7 +4475,7 @@ formatted dump file, such as produced by xwd.")
             "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"))))
     (build-system gnu-build-system)
     (inputs
-     `(("xproto" ,xproto)))
+     `(("xorgproto" ,xorgproto)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4512,7 +4533,7 @@ cannot be adequately worked around on the client side of the wire.")
       ;; These are all in the Requires or Requires.private field of xdamage.pc
       `(("damageproto" ,damageproto)
         ("libxfixes" ,libxfixes)
-        ("xproto" ,xproto)
+        ("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -4625,7 +4646,7 @@ cannot be adequately worked around on the client side of the wire.")
     (propagated-inputs
       `(("renderproto" ,renderproto)))
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -4690,7 +4711,7 @@ protocol and arbitrary X extension protocol.")
     (propagated-inputs
      `(("videoproto" ,videoproto)))
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)))
     (native-inputs
@@ -4737,7 +4758,6 @@ server core font system.  The current implementation is a simple wrapper
 script around the mkfontscale program.")
     (license license:x11)))
 
-
 (define-public xproto
   (package
     (name "xproto")
@@ -4766,30 +4786,8 @@ the X Window System Core Protocol, Version 11.
 It also includes a number of headers that aren't purely protocol related,
 but are depended upon by many other X Window System packages to provide
 common definitions and porting layer.")
-    (license license:x11)))
-
-(define-public xorgproto
-  (package
-    (name "xorgproto")
-    (version "2018.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://xorg/individual/proto/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
-    (build-system gnu-build-system)
-    (propagated-inputs
-     ;; To get util-macros in (almost?) all package inputs.
-     `(("util-macros" ,util-macros)))
-    (home-page "https://cgit.freedesktop.org/xorg/proto/xorgproto")
-    (synopsis "Xorg protocol headers")
-    (description
-     "This package provides the headers and specification documents defining
-the core protocol and (many) extensions for the X Window System.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 ;; packages of height 2 in the propagated-inputs tree
 
@@ -4809,7 +4807,7 @@ the core protocol and (many) extensions for the X Window System.")
             "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
       `(("libbsd" ,libbsd)
         ("xtrans" ,xtrans)))
@@ -4837,7 +4835,7 @@ the core protocol and (many) extensions for the X Window System.")
             "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4865,7 +4863,7 @@ an X Window System display.")
     (propagated-inputs
       `(("fixesproto" ,fixesproto)))
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -4893,7 +4891,7 @@ an X Window System display.")
       `(("fontsproto" ,fontsproto)
         ("freetype" ,freetype)
         ("libfontenc" ,libfontenc)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (inputs
       `(("zlib" ,zlib)
         ("xtrans" ,xtrans)))
@@ -4943,7 +4941,7 @@ new API's in libXft, or the legacy API's in libX11.")
         ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)))
     (inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4972,7 +4970,7 @@ new API's in libXft, or the legacy API's in libX11.")
         ("libxext" ,libxext)
         ("libxrender" ,libxrender)
         ("randrproto" ,randrproto)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4999,7 +4997,7 @@ new API's in libXft, or the legacy API's in libX11.")
     (propagated-inputs
       `(("libxv" ,libxv)))
     (inputs
-      `(("xproto" ,xproto)
+      `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)))
     (native-inputs
@@ -5133,7 +5131,7 @@ over Xlib, including:
         ("xextproto" ,xextproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (inputs
       `(("bigreqsproto" ,bigreqsproto)
         ("compositeproto" ,compositeproto)
@@ -5334,7 +5332,7 @@ draggable titlebars and borders.")
       `(("libx11" ,libx11)
         ("libxrender" ,libxrender)
         ("libxfixes" ,libxfixes)
-        ("xproto" ,xproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
 ;; TODO: add XCURSOR_PATH=.../share/icons to profile search paths, so
@@ -5408,7 +5406,7 @@ draggable titlebars and borders.")
         ("libxpm" ,libxpm)
         ("libxt" ,libxt)))
     (inputs
-      `(("xproto" ,xproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5437,7 +5435,7 @@ Intrinsics (Xt) Library.")
      `(("libxt" ,libxt)
        ("libxmu" ,libxmu)
        ("libxext" ,libxext)
-       ("xproto" ,xproto)))
+       ("xorgproto" ,xorgproto)))
     (native-inputs
      `(("bison" ,bison)
        ("pkg-config" ,pkg-config)))
@@ -5660,7 +5658,7 @@ The XCB util-wm module provides the following libraries:
                 "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"))))
     (build-system gnu-build-system)
     (inputs
-     `(("xproto" ,xproto)
+     `(("xorgproto" ,xorgproto)
        ("libx11" ,libx11)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -5800,7 +5798,7 @@ to answer a question.  Xmessage can also exit after a specified time.")
        ("libX11" ,libx11)
        ("libXext" ,libxext)
        ("libXt" ,libxt)
-       ("xproto" ,xproto)
+       ("xorgproto" ,xorgproto)
        ("libXaw" ,libxaw)))
     (home-page "https://invisible-island.net/xterm/")
     (synopsis "Terminal emulator for the X Window System")
-- 
2.16.2

[bug#30763] [PATCH core-updates 02/27] gnu: Switch from randrproto to xorgproto.

[Marius Bakke]

* gnu/packages/mate.scm (mate-control-center, mate-screensaver)[inputs]:
Remove RANDRPROTO.
* gnu/packages/xorg.scm (libxrandr, xorg-server)[inputs]: Likewise.
(randrproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/mate.scm | 2 --
 gnu/packages/xorg.scm | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 1faabd133..d6ad02298 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -924,7 +924,6 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
        ("kbproto" ,kbproto)
-       ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xextpro" ,xextproto)
@@ -1197,7 +1196,6 @@ Re-decorates windows on un-maximise.
        ("kbproto" ,kbproto)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
-       ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 26704e606..c3fb9f214 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1677,7 +1677,8 @@ network-transparent printing system.")
      "Resize and Rotate Extension defines a protocol for clients to
 dynamically change X screens, so as to resize, rotate and reflect the root
 window of a screen.")
-    (license license:x11)))
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 
 (define-public recordproto
@@ -4969,7 +4970,6 @@ new API's in libXft, or the legacy API's in libX11.")
       `(("libx11" ,libx11)
         ("libxext" ,libxext)
         ("libxrender" ,libxrender)
-        ("randrproto" ,randrproto)
         ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
@@ -5123,7 +5123,6 @@ over Xlib, including:
         ("mesa" ,mesa)
         ("pixman" ,pixman)
         ("presentproto" ,presentproto)
-        ("randrproto" ,randrproto)
         ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 03/27] gnu: Switch from bigreqsproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xorg-server)[inputs]: Remove BIGREQSPROTO.
(bigreqsproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/xorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c3fb9f214..da0e490a5 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -246,8 +246,8 @@ the core protocol and (many) extensions for the X Window System.")
     (description
      "Big Requests Extension defines a protocol to enable the use of
 requests that exceed 262140 bytes in length.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public compositeproto
   (package
@@ -5132,8 +5132,7 @@ over Xlib, including:
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
-      `(("bigreqsproto" ,bigreqsproto)
-        ("compositeproto" ,compositeproto)
+      `(("compositeproto" ,compositeproto)
         ("damageproto" ,damageproto)
         ("udev" ,eudev)
         ("dbus" ,dbus)
-- 
2.16.2

[bug#30763] [PATCH core-updates 04/27] gnu: Switch from xextproto to xorgproto.

[Marius Bakke]

* gnu/packages/enlightenment.scm (efl)[inputs]: Remove XEXTPROTO.
* gnu/packages/mate.scm (mate-control-center, mate-screensaver,
mate-utils)[native-inputs]: Likewise.
* gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise.
* gnu/packages/gtk.scm (cairo)[inputs]: Replace XEXTPROTO with XORGPROTO.
* gnu/packages/ratpoison.scm (ratpoison)[inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (libdmx, libwindowswm, fixesproto, libxext,
libx11)[inputs]: Likewise.
(xorg-server): [inputs]: Remove XEXTPROTO.
(libxext)[properties]: Mark as superseded by XORGPROTO.

squash
---
 gnu/packages/enlightenment.scm |  1 -
 gnu/packages/gtk.scm           |  2 +-
 gnu/packages/mate.scm          |  3 ---
 gnu/packages/ratpoison.scm     |  2 +-
 gnu/packages/xdisorg.scm       |  1 -
 gnu/packages/xnee.scm          |  1 -
 gnu/packages/xorg.scm          | 15 +++++++--------
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 81eacb433..871166226 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -110,7 +110,6 @@
        ("printproto" ,printproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("wayland-protocols" ,wayland-protocols)
-       ("xextproto" ,xextproto)
        ("xinput" ,xinput)
        ("xpr" ,xpr)
        ("xorgproto" ,xorgproto)))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a96cb9647..78fa9d719 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -132,7 +132,7 @@ tools have full access to view and control running applications.")
     `(("ghostscript" ,ghostscript)
       ("libspectre" ,libspectre)
       ("poppler" ,poppler)
-      ("xextproto" ,xextproto)
+      ("xorgproto" ,xorgproto)
       ("zlib" ,zlib)))
    (native-inputs
      `(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d6ad02298..d39711b6d 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -926,7 +926,6 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("kbproto" ,kbproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
-       ("xextpro" ,xextproto)
        ("xorgproto" ,xorgproto)
        ("xmodmap" ,xmodmap)
        ("gobject-introspection" ,gobject-introspection)))
@@ -1199,7 +1198,6 @@ Re-decorates windows on un-maximise.
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
-       ("xextpro" ,xextproto)
        ("xorgproto" ,xorgproto)))
     (inputs
      `(("cairo" ,cairo)
@@ -1254,7 +1252,6 @@ can be used as backgrounds in the MATE Desktop environment.")
        ("libsm" ,libsm)
        ("pkg-config" ,pkg-config)
        ("scrollkeeper" ,scrollkeeper)
-       ("xextpro" ,xextproto)
        ("xorgproto" ,xorgproto)
        ("yelp-tools" ,yelp-tools)))
     (inputs
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index d630c24fd..4c83d0f67 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -77,7 +77,7 @@
        ("libXtst" ,libxtst)
        ("libX11" ,libx11)
        ("readline" ,readline)
-       ("xextproto" ,xextproto)))
+       ("xorgproto" ,xorgproto)))
     (native-inputs
      `(("perl",perl)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8432503e3..2d3a60a86 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -628,7 +628,6 @@ things less distracting.")
        ("libxtst" ,libxtst)))
     (native-inputs
      `(("inputproto" ,inputproto)
-       ("xextproto" ,xextproto)
        ("xorgproto" ,xorgproto)))
     (synopsis "Tools to automate tasks in X such as detecting on screen images")
     (description
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 36fc5b963..207a11c63 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -46,7 +46,6 @@
        ("libxi" ,libxi)
        ("libxtst" ,libxtst)
        ("recordproto" ,recordproto)
-       ("xextproto" ,xextproto)
        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index da0e490a5..71e5f004c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1033,7 +1033,7 @@ of new capabilities and controls for text keyboards.")
             "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
+      `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("dmxproto" ,dmxproto)))
@@ -1244,7 +1244,7 @@ hit when running single-threaded.")
             "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
+      `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("windowswmproto" ,windowswmproto)))
@@ -2381,8 +2381,8 @@ usage.")
 Extended-Visual-Information, Generic Event Extension, LBX, MIT-SHM,
 MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP,
 XC-APPGROUP, XTEST.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public libevdev
   (package
@@ -4503,7 +4503,7 @@ formatted dump file, such as produced by xwd.")
             "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xextproto" ,xextproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4560,7 +4560,7 @@ cannot be adequately worked around on the client side of the wire.")
             "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xextproto" ,xextproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
       `(("libxau" ,libxau)
         ("libx11" ,libx11)))
@@ -5127,7 +5127,6 @@ over Xlib, including:
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
         ("videoproto" ,videoproto)
-        ("xextproto" ,xextproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
@@ -5300,7 +5299,7 @@ draggable titlebars and borders.")
         ("libxcb" ,libxcb)))
     (inputs
       `(("inputproto" ,inputproto)
-        ("xextproto" ,xextproto)
+        ("xorgproto" ,xorgproto)
         ("xtrans" ,xtrans)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
-- 
2.16.2

[bug#30763] [PATCH core-updates 05/27] gnu: Switch from fixesproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (compositeproto)[inputs]: Replace FIXESPROTO with XORGPROTO.
(libxfixes)[propagated-inputs]: Likewise.
[inputs]: Remove XORGPROTO.
(fixesproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/xorg.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 71e5f004c..63e00b5e1 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -265,7 +265,7 @@ requests that exceed 262140 bytes in length.")
             "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"))))
     (build-system gnu-build-system)
     (inputs
-      `(("fixesproto" ,fixesproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4512,8 +4512,8 @@ formatted dump file, such as produced by xwd.")
      "Fixes Extension makes changes to many areas of the protocol to resolve
 issues raised by application interaction with core protocol mechanisms that
 cannot be adequately worked around on the client side of the wire.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public libxdamage
   (package
@@ -4862,10 +4862,9 @@ an X Window System display.")
             "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("fixesproto" ,fixesproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
-      `(("xorgproto" ,xorgproto)
-        ("libx11" ,libx11)))
+      `(("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
-- 
2.16.2

[bug#30763] [PATCH core-updates 06/27] gnu: Switch from compositeproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (compositeproto)[properties]: Mark as superseded by
XORGPROTO.
(libxcomposite)[propagated-inputs]: Remove COMPOSITEPROTO.
(xorg-server)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[inputs]: Likewise.
---
 gnu/packages/enlightenment.scm |  1 -
 gnu/packages/xorg.scm          | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 871166226..170626b49 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -76,7 +76,6 @@
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("compositeproto" ,compositeproto)
        ("curl" ,curl)
        ("ghostscript" ,ghostscript)
        ("giflib" ,giflib)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 63e00b5e1..5eeec7504 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -273,8 +273,8 @@ requests that exceed 262140 bytes in length.")
     (description
      "Composite Extension contains header files and documentation for
 the damage protocol.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public damageproto
   (package
@@ -1279,8 +1279,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
      ;; xcomposite.pc refers to all these.
       `(("xorgproto" ,xorgproto)
         ("libxfixes" ,libxfixes)
-        ("libx11" ,libx11)
-        ("compositeproto" ,compositeproto)))
+        ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5130,8 +5129,7 @@ over Xlib, including:
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
-      `(("compositeproto" ,compositeproto)
-        ("damageproto" ,damageproto)
+      `(("damageproto" ,damageproto)
         ("udev" ,eudev)
         ("dbus" ,dbus)
         ("dmxproto" ,dmxproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 07/27] gnu: Switch from kbproto to xorgproto.

[Marius Bakke]

* gnu/packages/mate.scm (mate-control-center, mate-screensaver)[inputs]:
Remove KBPROTO.
* gnu/packages/xorg.scm (kbproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove KBPROTO.
(libx11)[propated-inputs]: Replace KBPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
---
 gnu/packages/mate.scm | 2 --
 gnu/packages/xorg.scm | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d39711b6d..8c3ea160d 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -923,7 +923,6 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("intltool" ,intltool)
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
-       ("kbproto" ,kbproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xorgproto" ,xorgproto)
@@ -1192,7 +1191,6 @@ Re-decorates windows on un-maximise.
        ("autoconf" ,autoconf-wrapper)
        ("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
-       ("kbproto" ,kbproto)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
        ("renderproto" ,renderproto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5eeec7504..21a65e7ec 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1010,8 +1010,8 @@ devices management such as graphic tablets.")
     (description
      "X Keyboard (XKB) Extension defines a protocol to provide a number
 of new capabilities and controls for text keyboards.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 ;; requires applewmproto, which compiles only on macos
 ;; (define-public libapplewm
@@ -5116,7 +5116,6 @@ over Xlib, including:
         ("dri3proto" ,dri3proto)
         ("fontsproto" ,fontsproto)
         ("inputproto" ,inputproto)
-        ("kbproto" ,kbproto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
@@ -5292,11 +5291,10 @@ draggable titlebars and borders.")
                                               (assoc-ref %outputs "doc")
                                               "/share/man"))))
     (propagated-inputs
-      `(("kbproto" ,kbproto)
+      `(("xorgproto" ,xorgproto)
         ("libxcb" ,libxcb)))
     (inputs
       `(("inputproto" ,inputproto)
-        ("xorgproto" ,xorgproto)
         ("xtrans" ,xtrans)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
-- 
2.16.2

[bug#30763] [PATCH core-updates 08/27] gnu: Switch from inputproto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO.
* gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO.
* gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by XORGPROTO.
(xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO.
(libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO.
(xkbutils, libx11)[inputs]: Likewise.
---
 gnu/packages/gl.scm        |  2 +-
 gnu/packages/ratpoison.scm |  3 +--
 gnu/packages/xdisorg.scm   |  3 +--
 gnu/packages/xnee.scm      |  1 -
 gnu/packages/xorg.scm      | 21 ++++++++-------------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0e416a9ef..68ce10673 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -105,7 +105,7 @@ as ASCII text.")
               ("libxi" ,libxi)
               ("libxrandr" ,libxrandr)
               ("libxxf86vm" ,libxxf86vm)
-              ("inputproto" ,inputproto)
+              ("xorgproto" ,xorgproto)
               ("xinput" ,xinput)))
     (propagated-inputs
      ;; Headers from Mesa and GLU are needed.
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 4c83d0f67..b1f012eb7 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -66,8 +66,7 @@
                         (copy-file (assoc-ref inputs rpd)
                                    (string-append dst rpd))))))))
     (inputs
-     `(("inputproto" ,inputproto)
-       ("fontconfig" ,fontconfig)
+     `(("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("libXft" ,libxft)
        ("libXi" ,libxi)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2d3a60a86..72a4da0b8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -627,8 +627,7 @@ things less distracting.")
        ("libxi" ,libxi)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("inputproto" ,inputproto)
-       ("xorgproto" ,xorgproto)))
+     `(("xorgproto" ,xorgproto)))
     (synopsis "Tools to automate tasks in X such as detecting on screen images")
     (description
      "Xautomation can control X from the command line for scripts, and
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 207a11c63..025dc2185 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -40,7 +40,6 @@
     (build-system gnu-build-system)
     (inputs
      `(("gtk+" ,gtk+-2)
-       ("inputproto" ,inputproto)
        ("libx11" ,libx11)
        ("libxext" ,libxext)
        ("libxi" ,libxi)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 21a65e7ec..3bec70a0c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -986,8 +986,8 @@ authentication records.")
     (description
      "Input Extension defines a protocol to provide additional input
 devices management such as graphic tablets.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public kbproto
   (package
@@ -2271,7 +2271,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.")
             "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"))))
     (build-system gnu-build-system)
     (inputs
-      `(("inputproto" ,inputproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)
         ("libxxf86vm" ,libxxf86vm)
         ("libxxf86dga" ,libxxf86dga)
@@ -3715,7 +3715,7 @@ alternative implementations like XRandR or TwinView.")
         ("libxext" ,libxext)
         ("libxi" ,libxi)
         ("libx11" ,libx11)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3820,9 +3820,8 @@ requested commands if they occur.")
     (build-system gnu-build-system)
     (inputs
       `(("libxt" ,libxt)
-        ("xorgproto" ,xorgproto)
         ("libxaw" ,libxaw)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4675,7 +4674,7 @@ cannot be adequately worked around on the client side of the wire.")
         ("libxi" ,libxi)))
     (inputs
       `(("libx11" ,libx11)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -4935,12 +4934,10 @@ new API's in libXft, or the legacy API's in libX11.")
             "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("inputproto" ,inputproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)
         ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)))
-    (inputs
-      `(("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5115,7 +5112,6 @@ over Xlib, including:
       `(("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("fontsproto" ,fontsproto)
-        ("inputproto" ,inputproto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
@@ -5294,8 +5290,7 @@ draggable titlebars and borders.")
       `(("xorgproto" ,xorgproto)
         ("libxcb" ,libxcb)))
     (inputs
-      `(("inputproto" ,inputproto)
-        ("xtrans" ,xtrans)))
+      `(("xtrans" ,xtrans)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
-- 
2.16.2

[bug#30763] [PATCH core-updates 09/27] gnu: Switch from fontsproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (fontsproto)[properties]: Mark as superseded by XORGPROTO.
(libfs, xf86-video-qxl)[inputs]: Remove FONTSPROTO.
(libxfont, xorg-server)[propagated-inputs]: Likewise.
---
 gnu/packages/xorg.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3bec70a0c..358e22776 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -909,8 +909,8 @@ For example: '6x10', '9x15bold', etc.")
     (description
      "Fonts Extension contains header files and documentation for
 the fonts protocol.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public glproto
   (package
@@ -1114,8 +1114,7 @@ synchronization between the X server and direct-rendering clients.")
     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)
-        ("xorgproto" ,xorgproto)
-        ("fontsproto" ,fontsproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3166,8 +3165,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
                 "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"))))
     (build-system gnu-build-system)
     (inputs
-      `(("fontsproto" ,fontsproto)
-        ("libxfont" ,libxfont2)
+      `(("libxfont" ,libxfont2)
         ("spice-protocol" ,spice-protocol)
         ("xf86dgaproto" ,xf86dgaproto)
         ("xorg-server" ,xorg-server)
@@ -4886,8 +4884,7 @@ an X Window System display.")
             "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("fontsproto" ,fontsproto)
-        ("freetype" ,freetype)
+      `(("freetype" ,freetype)
         ("libfontenc" ,libfontenc)
         ("xorgproto" ,xorgproto)))
     (inputs
@@ -5111,7 +5108,6 @@ over Xlib, including:
     (propagated-inputs
       `(("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
-        ("fontsproto" ,fontsproto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-- 
2.16.2

[bug#30763] [PATCH core-updates 10/27] gnu: Switch from glproto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (mesa)[propaged-inputs]: Replace GLPROTO with XORGPROTO.
* gnu/packages/xorg.scm (glproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/gl.scm   | 6 +++---
 gnu/packages/xorg.scm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 68ce10673..8bd74e0b3 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -240,15 +240,15 @@ also known as DXTn or DXTC) for Mesa.")
                          "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("glproto" ,glproto)
-        ;; The following are in the Requires.private field of gl.pc.
+      `(;; The following are in the Requires.private field of gl.pc.
         ("libdrm" ,libdrm)
         ("libvdpau" ,libvdpau)
         ("libx11" ,libx11)
         ("libxdamage" ,libxdamage)
         ("libxfixes" ,libxfixes)
         ("libxshmfence" ,libxshmfence)
-        ("libxxf86vm" ,libxxf86vm)))
+        ("libxxf86vm" ,libxxf86vm)
+        ("xorgproto" ,xorgproto)))
     (inputs
       `(("expat" ,expat)
         ("dri2proto" ,dri2proto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 358e22776..5f20804f3 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -933,8 +933,8 @@ the fonts protocol.")
     (description
      "OpenGL Extension defines a protocol for the client to send 3D
 rendering commands to the X server.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public iceauth
   (package
-- 
2.16.2

[bug#30763] [PATCH core-updates 11/27] gnu: Switch from dmxproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (dmxproto)[properties]: Mark as superseded by XORGPROTO.
(libdmx, xorg-server)[inputs]: Remove DMXPROTO.
---
 gnu/packages/xorg.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5f20804f3..150962206 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -322,8 +322,8 @@ the damage protocol.")
      "DMX (Distributed Multihead X) Extension defines a protocol for clients
 to access a front-end proxy X server that controls multiple back-end X
 servers making up a large display.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public dri2proto
   (package
@@ -1035,8 +1035,7 @@ of new capabilities and controls for text keyboards.")
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("dmxproto" ,dmxproto)))
+        ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5123,7 +5122,6 @@ over Xlib, including:
       `(("damageproto" ,damageproto)
         ("udev" ,eudev)
         ("dbus" ,dbus)
-        ("dmxproto" ,dmxproto)
         ("libdmx" ,libdmx)
         ("libepoxy" ,libepoxy)
         ("libgcrypt" ,libgcrypt)
-- 
2.16.2

[bug#30763] [PATCH core-updates 12/27] gnu: Switch from damageproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (damageproto)[properties]: Mark as superseded by XORGPROTO.
(libxdamage)[propagated-inputs]: Remove DAMAGEPROTO.
(xorg-server)[inputs]: Likewise.
---
 gnu/packages/xorg.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 150962206..60d39cf2a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -297,8 +297,8 @@ the damage protocol.")
     (description
      "Damage Extension contains header files and documentation for
 the damage protocol.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public dmxproto
   (package
@@ -4527,8 +4527,7 @@ cannot be adequately worked around on the client side of the wire.")
     (build-system gnu-build-system)
     (propagated-inputs
       ;; These are all in the Requires or Requires.private field of xdamage.pc
-      `(("damageproto" ,damageproto)
-        ("libxfixes" ,libxfixes)
+      `(("libxfixes" ,libxfixes)
         ("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
@@ -5119,8 +5118,7 @@ over Xlib, including:
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
-      `(("damageproto" ,damageproto)
-        ("udev" ,eudev)
+      `(("udev" ,eudev)
         ("dbus" ,dbus)
         ("libdmx" ,libdmx)
         ("libepoxy" ,libepoxy)
-- 
2.16.2

[bug#30763] [PATCH core-updates 13/27] gnu: Switch from dri2proto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (mesa)[inputs]: Remove DRI2PROTO.
* gnu/packages/video.scm (libvdpau)[inputs]: Replace DRI2PROTO with XORGPROTO.
* gnu/packages/xorg.scm (dri2proto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove DRI2PROTO.
---
 gnu/packages/gl.scm    | 1 -
 gnu/packages/video.scm | 6 +++---
 gnu/packages/xorg.scm  | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 8bd74e0b3..5ac390e61 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -251,7 +251,6 @@ also known as DXTn or DXTC) for Mesa.")
         ("xorgproto" ,xorgproto)))
     (inputs
       `(("expat" ,expat)
-        ("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("libelf" ,libelf)    ;required for r600 when using llvm
         ("libva" ,(force libva-without-mesa))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dfd94f9d3..e4d0748d4 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1935,9 +1935,9 @@ and JACK.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("dri2proto" ,dri2proto)
-       ("libx11" ,libx11 "out")
-       ("libxext" ,libxext)))
+     `(("libx11" ,libx11 "out")
+       ("libxext" ,libxext)
+       ("xorgproto" ,xorgproto)))
     (home-page "https://wiki.freedesktop.org/www/Software/VDPAU/")
     (synopsis "Video Decode and Presentation API")
     (description "VDPAU is the Video Decode and Presentation API for UNIX.  It
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 60d39cf2a..1a395c3f8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -346,7 +346,8 @@ servers making up a large display.")
      "Direct Rendering Infrastructure 2 Extension defines a protocol to
 securely allow user applications to access the video hardware without
 requiring data to be passed through the X server.")
-    (license license:x11)))
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public dri3proto
   (package
@@ -5104,8 +5105,7 @@ over Xlib, including:
             (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("dri2proto" ,dri2proto)
-        ("dri3proto" ,dri3proto)
+      `(("dri3proto" ,dri3proto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-- 
2.16.2

[bug#30763] [PATCH core-updates 14/27] gnu: Switch from dri3proto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (mesa)[inputs]: Remove DRI3PROTO.
* gnu/packages/xorg.scm (xorg-server)[propagated-inputs]: Likewise.
(dri3proto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/gl.scm   | 1 -
 gnu/packages/xorg.scm | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 5ac390e61..b70016619 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -251,7 +251,6 @@ also known as DXTn or DXTC) for Mesa.")
         ("xorgproto" ,xorgproto)))
     (inputs
       `(("expat" ,expat)
-        ("dri3proto" ,dri3proto)
         ("libelf" ,libelf)    ;required for r600 when using llvm
         ("libva" ,(force libva-without-mesa))
         ("libxml2" ,libxml2)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 1a395c3f8..59cb00bb0 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -372,7 +372,8 @@ translate between direct rendered buffers and X pixmaps.  When combined with
 the Present extension, a complete direct rendering solution for OpenGL is
 provided.")
     (license (license:x11-style "file://dri3proto.h"
-                                "See 'dri3proto.h' in the distribution."))))
+                                "See 'dri3proto.h' in the distribution."))
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public %app-defaults-dir "/lib/X11/app-defaults")
 
@@ -5105,8 +5106,7 @@ over Xlib, including:
             (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("dri3proto" ,dri3proto)
-        ("libpciaccess" ,libpciaccess)
+      `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
         ("presentproto" ,presentproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 15/27] gnu: Switch from videoproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (videoproto)[properties]: Mark as superseded by XORGPROTO.
(libxv)[propagated-inputs]: Replace VIDEOPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
(xorg-server)[propagated-inputs]: Likewise.
---
 gnu/packages/xorg.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 59cb00bb0..5fa04e8a3 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1929,8 +1929,8 @@ generate new versions of their configure scripts with autoconf.")
     (description
      "Video Extension provides a protocol for a video output mechanism,
 mainly to rescale video playback in the video controller hardware.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public windowswmproto
   (package
@@ -4706,10 +4706,9 @@ protocol and arbitrary X extension protocol.")
             "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"))))
     (build-system gnu-build-system)
     (propagated-inputs
-     `(("videoproto" ,videoproto)))
+     `(("xorgproto" ,xorgproto)))
     (inputs
-      `(("xorgproto" ,xorgproto)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -5113,7 +5112,6 @@ over Xlib, including:
         ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
-        ("videoproto" ,videoproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
-- 
2.16.2

[bug#30763] [PATCH core-updates 16/27] gnu: Switch from windowswmproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (libwindowswm)[inputs]: Remove WINDOWSWMPROTO.
(windowswmproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/xorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5fa04e8a3..ac673e65d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1246,8 +1246,7 @@ hit when running single-threaded.")
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("windowswmproto" ,windowswmproto)))
+        ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1955,8 +1954,8 @@ mainly to rescale video playback in the video controller hardware.")
 an X11 server and the Microsoft Windows native window manager.  WindowsWM
 is only intended to be used on Cygwin when running a rootless XWin
 server.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public x11perf
   (package
-- 
2.16.2

[bug#30763] [PATCH core-updates 17/27] gnu: Switch from xcmiscproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xcmiscproto)[properties]: Mark as superseded by
XORGPROTO.
(xorg-server)[inputs]: Remove XCMISCPROTO.
---
 gnu/packages/xorg.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ac673e65d..1a5dde59d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2162,8 +2162,8 @@ generators in individual language bindings.")
     (description
      "XC-MISC Extension defines a protocol that provides Xlib two ways
 to query the server for available resource IDs.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xcmsdb
   (package
@@ -5132,7 +5132,6 @@ over Xlib, including:
         ("libxt" ,libxt)
         ("libxv" ,libxv)
         ("recordproto" ,recordproto)
-        ("xcmiscproto" ,xcmiscproto)
         ("xf86bigfontproto" ,xf86bigfontproto)
         ("xf86dgaproto" ,xf86dgaproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 18/27] gnu: Switch from presentproto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (mesa)[inputs]: Remove PRESENTPROTO.
* gnu/packages/xorg.scm (xorg-server)[inputs]: Likewise.
(presentproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/gl.scm   | 1 -
 gnu/packages/xorg.scm | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b70016619..7a8d6078c 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -262,7 +262,6 @@ also known as DXTn or DXTC) for Mesa.")
             (_
              `()))
         ("makedepend" ,makedepend)
-        ("presentproto" ,presentproto)
         ("wayland" ,wayland)
         ("wayland-protocols" ,wayland-protocols)))
     (native-inputs
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 1a5dde59d..996d18728 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1627,7 +1627,8 @@ window contents from a pixmap in a well defined fashion, synchronizing
 with the display refresh and potentially using a more efficient
 mechanism than copying the contents of the source pixmap.")
     (license (license:x11-style "file://presentproto.h"
-                                "See 'presentproto.h' in the distribution."))))
+                                "See 'presentproto.h' in the distribution."))
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public printproto
   (package
@@ -5107,7 +5108,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("presentproto" ,presentproto)
         ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 19/27] gnu: Switch from renderproto to xorgproto.

[Marius Bakke]

* gnu/packages/mate.scm (mate-control-center,
mate-screensaver)[native-inputs]: Remove RENDERPROTO.
* gnu/packages/xorg.scm (renderproto)[properties]: Mark as superseded by XORGPROTO.
(libxrender)[propagated-inputs]: Replace RENDERPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
* gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RENDERPROTO.
---
 gnu/packages/mate.scm |  2 --
 gnu/packages/xorg.scm | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 8c3ea160d..7b1612797 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -923,7 +923,6 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("intltool" ,intltool)
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
-       ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xorgproto" ,xorgproto)
        ("xmodmap" ,xmodmap)
@@ -1193,7 +1192,6 @@ Re-decorates windows on un-maximise.
        ("intltool" ,intltool)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
-       ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
        ("xorgproto" ,xorgproto)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 996d18728..15ef60e36 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1725,8 +1725,8 @@ of user actions in the X Window System.")
     (description
      "Rendering Extension defines a protcol for a digital image composition
 as the foundation of a new rendering model within the X Window System.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public resourceproto
   (package
@@ -4641,10 +4641,9 @@ cannot be adequately worked around on the client side of the wire.")
             "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("renderproto" ,renderproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
-      `(("xorgproto" ,xorgproto)
-        ("libx11" ,libx11)))
+      `(("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5108,7 +5107,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
         ("xineramaproto" ,xineramaproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 20/27] gnu: Switch from resourceproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (libxres)[inputs]: Remove RESOURCEPROTO.
(resourceproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[propagated-inputs]: Remove RESOURCEPROTO.
---
 gnu/packages/xorg.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 15ef60e36..7a65e45d9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1451,8 +1451,7 @@ treat it as part of their software base when porting.")
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("resourceproto" ,resourceproto)))
+        ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1749,8 +1748,8 @@ as the foundation of a new rendering model within the X Window System.")
     (description
      "Resource Extension defines a protocol that allows a client to
 query the X server about its usage of various resources.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public scrnsaverproto
   (package
@@ -5107,7 +5106,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 21/27] gnu: Switch from recordproto to xorgproto.

[Marius Bakke]

* gnu/packages/xnee.scm (xnee)[inputs]: Remove RECORDPROTO.
* gnu/packages/xorg.scm (recordproto)[properties]: Mark as superseded by
XORGPROTO.
(libxtst)[propagated-inputs]: Replace RECORDPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
* gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RECORDPROTO.
---
 gnu/packages/xnee.scm |  1 -
 gnu/packages/xorg.scm | 12 +++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 025dc2185..5cd20cbef 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -44,7 +44,6 @@
        ("libxext" ,libxext)
        ("libxi" ,libxi)
        ("libxtst" ,libxtst)
-       ("recordproto" ,recordproto)
        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 7a65e45d9..f46aec0c4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1700,8 +1700,8 @@ window of a screen.")
     (description
      "Record Extension defines a protocol for the recording and playback
 of user actions in the X Window System.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public renderproto
   (package
@@ -4666,11 +4666,10 @@ cannot be adequately worked around on the client side of the wire.")
             "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("recordproto" ,recordproto)
-        ("libxi" ,libxi)))
+     `(("libxi" ,libxi)
+       ("xorgproto" ,xorgproto)))
     (inputs
-      `(("libx11" ,libx11)
-        ("xorgproto" ,xorgproto)))
+      `(("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -5127,7 +5126,6 @@ over Xlib, including:
         ("libxshmfence" ,libxshmfence)
         ("libxt" ,libxt)
         ("libxv" ,libxv)
-        ("recordproto" ,recordproto)
         ("xf86bigfontproto" ,xf86bigfontproto)
         ("xf86dgaproto" ,xf86dgaproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
-- 
2.16.2

[bug#30763] [PATCH core-updates 22/27] gnu: Switch from scrnsaverproto to xorgproto.

[Marius Bakke]

* gnu/packages/enlightenment.scm (efl)[inputs]: Remove SCRNSAVERPROTO.
* gnu/packages/mate.scm (mate-control-center,
mate-screensaver)[native-inputs]: Remove SCRNSAVERPROTO.
* gnu/packages/xorg.scm (libxscrnsaver)[propagated-inputs]: Change from
SCRNSAVERPROTO to XORGPROTO.
(scrnsaverproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[propagated-inputs]: Remove SCRNSAVERPROTO.
---
 gnu/packages/enlightenment.scm | 1 -
 gnu/packages/mate.scm          | 2 --
 gnu/packages/xorg.scm          | 7 +++----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 170626b49..e46d2b166 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -107,7 +107,6 @@
        ("openjpeg" ,openjpeg-1)
        ("poppler" ,poppler)
        ("printproto" ,printproto)
-       ("scrnsaverproto" ,scrnsaverproto)
        ("wayland-protocols" ,wayland-protocols)
        ("xinput" ,xinput)
        ("xpr" ,xpr)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 7b1612797..abd297acb 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -923,7 +923,6 @@ icons on the MATE desktop.  It works on local and remote file systems.")
        ("intltool" ,intltool)
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
-       ("scrnsaverproto" ,scrnsaverproto)
        ("xorgproto" ,xorgproto)
        ("xmodmap" ,xmodmap)
        ("gobject-introspection" ,gobject-introspection)))
@@ -1192,7 +1191,6 @@ Re-decorates windows on un-maximise.
        ("intltool" ,intltool)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
-       ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
        ("xorgproto" ,xorgproto)))
     (inputs
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f46aec0c4..eac098d9b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1479,7 +1479,7 @@ treat it as part of their software base when porting.")
       `(("libxext" ,libxext)
         ("libx11" ,libx11)))
     (propagated-inputs
-      `(("scrnsaverproto" ,scrnsaverproto)))
+      `(("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -1772,8 +1772,8 @@ query the X server about its usage of various resources.")
     (description
      "Screen Saver Extension defines a protocol to control screensaver
 features and to query screensaver info on specific windows.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public sessreg
   (package
@@ -5105,7 +5105,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("scrnsaverproto" ,scrnsaverproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
-- 
2.16.2

[bug#30763] [PATCH core-updates 23/27] gnu: Switch from xf86driproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xf86-video-mach64, xf86-video-mga, xf86-video-ati,
xf86-video-openchrome, xf86-video-r128, xf86-video-savage, xf86-video-sis,
xf86-video-tdfx)[inputs]: Replace XF86DRIPROTO with XORGPROTO.
(xf86driproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove XF86DRIPROTO.
---
 gnu/packages/xorg.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index eac098d9b..92d4b46a8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2686,7 +2686,7 @@ as USB mice.")
             "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xxf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor
@@ -2976,7 +2976,7 @@ It supports a variety of Intel graphics chipsets.")
         (patches (search-patches "xf86-video-mach64-glibc-2.20.patch"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -3007,7 +3007,7 @@ the same level of support for generic VGA or 8514/A adapters.")
            "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3138,7 +3138,7 @@ graphics cards.")
               ("libxext" ,libxext)
               ("libxvmc" ,libxvmc)
               ("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -3195,7 +3195,7 @@ This driver is intended for the spice qxl virtio device.")
            "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3222,7 +3222,7 @@ This driver is intended for ATI Rage 128 based cards.")
            "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3275,7 +3275,7 @@ Xorg X server.")
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xf86dgaproto" ,xf86dgaproto)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
@@ -3351,7 +3351,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
            "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86driproto" ,xf86driproto)
+              ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3578,8 +3578,8 @@ direct linear framebuffer access.")
      "XFree86 Direct Rendering Infrastructure Extension defines a
 protocol to allow user applications to access the video hardware without
 requiring data to be passed through the X server.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xf86vidmodeproto
   (package
@@ -5106,7 +5106,6 @@ over Xlib, including:
         ("mesa" ,mesa)
         ("pixman" ,pixman)
         ("xineramaproto" ,xineramaproto)
-        ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
       `(("udev" ,eudev)
-- 
2.16.2

[bug#30763] [PATCH core-updates 24/27] gnu: Switch from xf86dgaproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (libxxf86dga, xf86-video-glint, xf86-video-neomagic,
xf86-video-tga, xf86-video-trident, xf86-video-voodoo)[inputs]: Replace
XF86DGAPROTO with XORGPROTO.
(xf86driproto)[properties]: Mark as superseded by XORGPROTO.
(xf86-video-qxl, xf86-video-sis, xorg-server)[inputs]: Remove XF86DGAPROTO.
---
 gnu/packages/xorg.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 92d4b46a8..fa5d3e43e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1504,7 +1504,7 @@ treat it as part of their software base when porting.")
             "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xf86dgaproto" ,xf86dgaproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
       `(("libx11" ,libx11)
         ("libxext" ,libxext)))
@@ -2874,7 +2874,7 @@ compositing.  Both support Xv overlay and dynamic rotation with XRandR.")
           (base32
            "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"))))
     (build-system gnu-build-system)
-    (inputs `(("xf86dgaproto" ,xf86dgaproto)
+    (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3031,7 +3031,7 @@ the same level of support for generic VGA or 8514/A adapters.")
           (base32
             "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"))))
     (build-system gnu-build-system)
-    (inputs `(("xf86dgaproto" ,xf86dgaproto)
+    (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3167,7 +3167,6 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
     (inputs
       `(("libxfont" ,libxfont2)
         ("spice-protocol" ,spice-protocol)
-        ("xf86dgaproto" ,xf86dgaproto)
         ("xorg-server" ,xorg-server)
         ("xorgproto" ,xorgproto)))
     (native-inputs
@@ -3274,7 +3273,6 @@ Xorg X server.")
            "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
-              ("xf86dgaproto" ,xf86dgaproto)
               ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs
@@ -3377,7 +3375,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
            "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"))
         (patches (search-patches "xf86-video-tga-remove-mibstore.patch"))))
     (build-system gnu-build-system)
-    (inputs `(("xf86dgaproto" ,xf86dgaproto)
+    (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3403,7 +3401,7 @@ X server.")
           (base32
            "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"))))
     (build-system gnu-build-system)
-    (inputs `(("xf86dgaproto" ,xf86dgaproto)
+    (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3497,7 +3495,7 @@ xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593")
                    "0rndmxf5b8j3hjnhrwrnzsq5024fli134fj1mprhkcrvax2zq8db"))
                  (file-name "xf86-video-voodoo-pcitag.patch"))))))
     (build-system gnu-build-system)
-    (inputs `(("xf86dgaproto" ,xf86dgaproto)
+    (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
@@ -3554,8 +3552,8 @@ for the XF86BigFontProto protocol.")
     (description
      "XFree86 Direct Graphic Access Extension defines a protocol for
 direct linear framebuffer access.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xf86driproto
   (package
@@ -5125,7 +5123,6 @@ over Xlib, including:
         ("libxt" ,libxt)
         ("libxv" ,libxv)
         ("xf86bigfontproto" ,xf86bigfontproto)
-        ("xf86dgaproto" ,xf86dgaproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
         ("xkbcomp" ,xkbcomp)
         ("xkeyboard-config" ,xkeyboard-config)
-- 
2.16.2

[bug#30763] [PATCH core-updates 25/27] gnu: Switch from xf86bigfontproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xf86bigfontproto)[properties]: Mark as superseded by
XORGPROTO.
(xorg-server)[inputs]: Remove XF86BIGFONTPROTO.
---
 gnu/packages/xorg.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index fa5d3e43e..54478a1e0 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3529,8 +3529,8 @@ xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593")
     (description
      "XFree86 Bigfont Extension contains header files and documentation
 for the XF86BigFontProto protocol.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xf86dgaproto
   (package
@@ -5122,7 +5122,6 @@ over Xlib, including:
         ("libxshmfence" ,libxshmfence)
         ("libxt" ,libxt)
         ("libxv" ,libxv)
-        ("xf86bigfontproto" ,xf86bigfontproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
         ("xkbcomp" ,xkbcomp)
         ("xkeyboard-config" ,xkeyboard-config)
-- 
2.16.2

[bug#30763] [PATCH core-updates 26/27] gnu: Switch from xf86vidmodeproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xf86vidmodeproto)[properties]: Mark as superseded by
XORGPROTO.
(libxxf86vm)[propagated-inputs]: Replace XF86VIDMODEPROTO with XORGPROTO.
(xorg-server)[inputs]: Remove XF86VIDMODEPROTO.
---
 gnu/packages/xorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 54478a1e0..b6cc19b59 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3599,8 +3599,8 @@ requiring data to be passed through the X server.")
     (description
      "XFree86 Video Mode Extension defines a protocol for dynamically
 configuring modelines and gamma.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xgamma
   (package
@@ -5010,7 +5010,7 @@ new API's in libXft, or the legacy API's in libX11.")
     (build-system gnu-build-system)
     (propagated-inputs
       `(("libxext" ,libxext)
-        ("xf86vidmodeproto" ,xf86vidmodeproto)))
+        ("xorgproto" ,xorgproto)))
     (inputs
       `(("libx11" ,libx11)))
     (native-inputs
@@ -5122,7 +5122,6 @@ over Xlib, including:
         ("libxshmfence" ,libxshmfence)
         ("libxt" ,libxt)
         ("libxv" ,libxv)
-        ("xf86vidmodeproto" ,xf86vidmodeproto)
         ("xkbcomp" ,xkbcomp)
         ("xkeyboard-config" ,xkeyboard-config)
         ("xtrans" ,xtrans)
-- 
2.16.2

[bug#30763] [PATCH core-updates 27/27] gnu: Switch from xineramaproto to xorgproto.

[Marius Bakke]

* gnu/packages/xorg.scm (xineramaproto)[properties]: Mark as superseded by
XORGPROTO.
(libxinerama)[propagated-inputs]: Replace XINERAMAPROTO with XORGPROTO.
(xorg-server)[propagated-inputs]: Remove XINERAMAPROTO.
---
 gnu/packages/xorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b6cc19b59..40e4ae46f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3686,8 +3686,8 @@ This extension provides a common network protocol for querying information
 which may be provided by different underlying screen combination
 technologies in the X server, such as the original Xinerama multiplexer, or
 alternative implementations like XRandR or TwinView.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public xinput
   (package
@@ -4582,7 +4582,7 @@ cannot be adequately worked around on the client side of the wire.")
             "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("xineramaproto" ,xineramaproto)))
+      `(("xorgproto" ,xorgproto)))
     (inputs
       `(("libxext" ,libxext)
         ("libx11" ,libx11)))
@@ -5103,7 +5103,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("xineramaproto" ,xineramaproto)
         ("xorgproto" ,xorgproto)))
     (inputs
       `(("udev" ,eudev)
-- 
2.16.2

[bug#30763] [PATCH core-updates 00/27] Use xorgproto everywhere

[Ludovic Courtès]

Hello Marius,

Marius Bakke <mbakke@fastmail.com> skribis:

> As promised in
> <https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00335.html>,
> this patch series makes the "xorgproto" package supersede the various
> X.org "-proto" packages that were previously distributed separately.

Woow, nice!

It LGTM.  Did you have a chance to run X in ‘guix system vm’ after these
changes, to make sure nothing bad happens?

Thank you!

Ludo’.

bug#30763: [PATCH core-updates 00/27] Use xorgproto everywhere

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Hello Marius,
>
> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> As promised in
>> <https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00335.html>,
>> this patch series makes the "xorgproto" package supersede the various
>> X.org "-proto" packages that were previously distributed separately.
>
> Woow, nice!
>
> It LGTM.  Did you have a chance to run X in ‘guix system vm’ after these
> changes, to make sure nothing bad happens?

Even better: I reconfigured my system on it (mostly because I did not
have overlayfs enabled in my kernel..!).  It works fine. :-)

Pushed to core-updates.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]