[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