Drop X11 extensions not shipped with recent X.Org server versions anymore:

  include/extensions: Xag.h, Xagsrv.h, Xagstr.h
  Xserver/Xext: appgroup.c, appgroup.h
  lib/Xext: XAppgroup.c

  include/extensions: Xcup.h, Xcupstr.h,
  Xserver/Xext: cup.c
  lib/Xext: cup.c

  include/extensions: Xdbe.h
  Xserver/Xext: Xdbe.c

  Xserver/Xext:  dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h

  include/extensions: Xevie.h, Xeviestr.h
  include/extensions: XEVI.h, XEVIstr.h
  Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c
  lib/Xext: XEVI.c

  include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h
  Xserver/Xext: fontcache.c

  include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h
  lib/Xext: XLbx.c

  include/extensions: multibuf.h, multibufst.h
  lib/Xext: XMultibuf.c
  Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c

  include/extensions: xf86vmode.h, xf86vmstr.h
  Xserver/Xext: vidmodeproc.h, xf86vmode.c

  lib/Xext: MITMisc.c
  Xserver/Xext: mitmisc.c

  Xserver/Xext: xf86misc.c, xf86miscproc.h

  Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c
  include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
  Fixes: ArcticaProject/nx-libs#116
  X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01

  Plus: Drop various Imake'ish defines where not needed anymore.

5 files changed, 43 insertions, 74 deletions

diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in
index 0d1df8c08..4a571b9fd 100644
--- a/debian/libnx-xext-dev.install.in
+++ b/debian/libnx-xext-dev.install.in
@@ -1,32 +1,9 @@
 usr/lib/*/libNX_Xext.so
-usr/include/*/nx-X11/extensions/MITMisc.h
-usr/include/*/nx-X11/extensions/XEVI.h
-usr/include/*/nx-X11/extensions/XEVIstr.h
-usr/include/*/nx-X11/extensions/Xevie.h
-usr/include/*/nx-X11/extensions/Xeviestr.h
-usr/include/*/nx-X11/extensions/XLbx.h
 usr/include/*/nx-X11/extensions/XShm.h
-usr/include/*/nx-X11/extensions/Xag.h
-usr/include/*/nx-X11/extensions/Xagsrv.h
-usr/include/*/nx-X11/extensions/Xagstr.h
-usr/include/*/nx-X11/extensions/Xcup.h
-usr/include/*/nx-X11/extensions/Xcupstr.h
-usr/include/*/nx-X11/extensions/Xdbe.h
-usr/include/*/nx-X11/extensions/Xdbeproto.h
 usr/include/*/nx-X11/extensions/Xext.h
 usr/include/*/nx-X11/extensions/dpms.h
 usr/include/*/nx-X11/extensions/dpmsstr.h
 usr/include/*/nx-X11/extensions/extutil.h
-usr/include/*/nx-X11/extensions/lbxstr.h
-usr/include/*/nx-X11/extensions/lbxbuf.h
-usr/include/*/nx-X11/extensions/lbxdeltastr.h
-usr/include/*/nx-X11/extensions/lbximage.h
-usr/include/*/nx-X11/extensions/lbxbufstr.h
-usr/include/*/nx-X11/extensions/lbxopts.h
-usr/include/*/nx-X11/extensions/lbxzlib.h
-usr/include/*/nx-X11/extensions/mitmiscstr.h
-usr/include/*/nx-X11/extensions/multibuf.h
-usr/include/*/nx-X11/extensions/multibufst.h
 usr/include/*/nx-X11/extensions/security.h
 usr/include/*/nx-X11/extensions/securstr.h
 usr/include/*/nx-X11/extensions/shape.h
diff --git a/debian/libnx-xext6.symbols b/debian/libnx-xext6.symbols
index 28f4c4fed..e48ae4968 100644
--- a/debian/libnx-xext6.symbols
+++ b/debian/libnx-xext6.symbols
@@ -8,12 +8,12 @@ libNX_Xext.so.6 libnx-xext6 #MINVER#
  DPMSInfo@Base 3.5.0.29
  DPMSQueryExtension@Base 3.5.0.29
  DPMSSetTimeouts@Base 3.5.0.29
- XLbxGetEventBase@Base 3.5.0.29
- XLbxQueryExtension@Base 3.5.0.29
- XLbxQueryVersion@Base 3.5.0.29
- XMITMiscGetBugMode@Base 3.5.0.29
- XMITMiscQueryExtension@Base 3.5.0.29
- XMITMiscSetBugMode@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XLbxQueryExtension@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XLbxQueryVersion@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XMITMiscGetBugMode@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XMITMiscQueryExtension@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XMITMiscSetBugMode@Base 3.5.0.29
  XMissingExtension@Base 3.5.0.29
  XSecurityAllocXauth@Base 3.5.0.29
  XSecurityFreeXauth@Base 3.5.0.29
@@ -85,44 +85,44 @@ libNX_Xext.so.6 libnx-xext6 #MINVER#
  XTestQueryInputSize@Base 3.5.0.29
  XTestReset@Base 3.5.0.29
  XTestStopInput@Base 3.5.0.29
- XagCreateAssociation@Base 3.5.0.29
- XagCreateEmbeddedApplicationGroup@Base 3.5.0.29
- XagCreateNonembeddedApplicationGroup@Base 3.5.0.29
- XagDestroyApplicationGroup@Base 3.5.0.29
- XagDestroyAssociation@Base 3.5.0.29
- XagGetApplicationGroupAttributes@Base 3.5.0.29
- XagQueryApplicationGroup@Base 3.5.0.29
- XagQueryVersion@Base 3.5.0.29
- XcupGetReservedColormapEntries@Base 3.5.0.29
- XcupQueryVersion@Base 3.5.0.29
- XcupStoreColors@Base 3.5.0.29
- XdbeAllocateBackBufferName@Base 3.5.0.29
- XdbeBeginIdiom@Base 3.5.0.29
- XdbeDeallocateBackBufferName@Base 3.5.0.29
- XdbeEndIdiom@Base 3.5.0.29
- XdbeFreeVisualInfo@Base 3.5.0.29
- XdbeGetBackBufferAttributes@Base 3.5.0.29
- XdbeGetVisualInfo@Base 3.5.0.29
- XdbeQueryExtension@Base 3.5.0.29
- XdbeSwapBuffers@Base 3.5.0.29
- XeviGetVisualInfo@Base 3.5.0.29
- XeviQueryExtension@Base 3.5.0.29
- XeviQueryVersion@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagCreateAssociation@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagCreateEmbeddedApplicationGroup@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagCreateNonembeddedApplicationGroup@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagDestroyApplicationGroup@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagDestroyAssociation@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagGetApplicationGroupAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagQueryApplicationGroup@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XagQueryVersion@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeAllocateBackBufferName@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeBeginIdiom@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeDeallocateBackBufferName@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeEndIdiom@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeFreeVisualInfo@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeGetBackBufferAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeGetVisualInfo@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeQueryExtension@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XdbeSwapBuffers@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29
  XextAddDisplay@Base 3.5.0.29
  XextCreateExtension@Base 3.5.0.29
  XextDestroyExtension@Base 3.5.0.29
  XextFindDisplay@Base 3.5.0.29
  XextRemoveDisplay@Base 3.5.0.29
- XmbufChangeBufferAttributes@Base 3.5.0.29
- XmbufChangeWindowAttributes@Base 3.5.0.29
- XmbufClearBufferArea@Base 3.5.0.29
- XmbufCreateBuffers@Base 3.5.0.29
- XmbufCreateStereoWindow@Base 3.5.0.29
- XmbufDestroyBuffers@Base 3.5.0.29
- XmbufDisplayBuffers@Base 3.5.0.29
- XmbufGetBufferAttributes@Base 3.5.0.29
- XmbufGetScreenInfo@Base 3.5.0.29
- XmbufGetVersion@Base 3.5.0.29
- XmbufGetWindowAttributes@Base 3.5.0.29
- XmbufQueryExtension@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufChangeBufferAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufChangeWindowAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufClearBufferArea@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufCreateBuffers@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufCreateStereoWindow@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufDestroyBuffers@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufDisplayBuffers@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufGetBufferAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufGetScreenInfo@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufGetVersion@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufGetWindowAttributes@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0#  XmbufQueryExtension@Base 3.5.0.29
  _XExtensionErrorFunction@Base 3.5.0.29
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in
index 61829cf29..f0dfd211e 100644
--- a/debian/nx-x11proto-xext-dev.install.in
+++ b/debian/nx-x11proto-xext-dev.install.in
@@ -3,3 +3,4 @@ usr/include/*/nx-X11/extensions/xtestconst.h
 usr/include/*/nx-X11/extensions/shapestr.h
 usr/include/*/nx-X11/extensions/shmstr.h
 usr/include/*/nx-X11/extensions/syncstr.h
+usr/include/*/nx-X11/extensions/Xdbeproto.h
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index 94e2cb075..89c78f985 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Last-Update: 2012-12-31
 --- a/nx-X11/config/cf/Imake.tmpl
 +++ b/nx-X11/config/cf/Imake.tmpl
-@@ -829,7 +829,7 @@
+@@ -776,7 +776,7 @@
  #define AlternateUsrLibDir YES
  #endif
  #else
diff --git a/debian/rules b/debian/rules
index 578fc84f8..9fc39464c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,17 +45,8 @@ override_dh_install:
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h