From b8071b0fa537a759be69892508ea8b9427b2adb1 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@freedesktop.org>
Date: Sat, 7 Oct 2006 01:26:48 -0700
Subject: [PATCH] Add <import>xproto</import> explicitly to extensions that use
 xproto.

---
 src/extensions/composite.xml   | 1 +
 src/extensions/damage.xml      | 1 +
 src/extensions/glx.xml         | 2 ++
 src/extensions/randr.xml       | 4 +++-
 src/extensions/render.xml      | 2 ++
 src/extensions/screensaver.xml | 2 ++
 src/extensions/shape.xml       | 2 ++
 src/extensions/shm.xml         | 2 ++
 src/extensions/sync.xml        | 2 ++
 src/extensions/xfixes.xml      | 1 +
 src/extensions/xprint.xml      | 3 ++-
 src/extensions/xtest.xml       | 3 ++-
 src/extensions/xv.xml          | 1 +
 13 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/extensions/composite.xml b/src/extensions/composite.xml
index f055549..48c90fd 100644
--- a/src/extensions/composite.xml
+++ b/src/extensions/composite.xml
@@ -26,6 +26,7 @@ authorization from the authors.
 -->
 <!-- This file describes version 0.3 of COMPOSITE. -->
 <xcb header="composite" extension-xname="Composite" extension-name="Composite">
+  <import>xproto</import>
   <import>xfixes</import>
 
   <enum name="Redirect">
diff --git a/src/extensions/damage.xml b/src/extensions/damage.xml
index cd79302..474fd60 100644
--- a/src/extensions/damage.xml
+++ b/src/extensions/damage.xml
@@ -26,6 +26,7 @@ authorization from the authors.
 -->
 <!-- This file describes version 1 of DAMAGE. -->
 <xcb header="damage" extension-xname="DAMAGE" extension-name="Damage">
+  <import>xproto</import>
   <import>xfixes</import>
 
   <xidtype name="DAMAGE" />
diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index b10326b..5f8b5e6 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -47,6 +47,8 @@ The patch that fixed this server bug in X.org CVS is here:
 <xcb header="glx" extension-xname="GLX" extension-name="Glx">
 	<!-- target support: 1.3 -->
 
+	<import>xproto</import>
+
 	<xidtype name="PIXMAP" />
 	<xidtype name="CONTEXT" />
 	<xidtype name="PBUFFER" />
diff --git a/src/extensions/randr.xml b/src/extensions/randr.xml
index 2dbbfa4..5c0ccdf 100644
--- a/src/extensions/randr.xml
+++ b/src/extensions/randr.xml
@@ -28,7 +28,9 @@ authorization from the authors.
 
 <xcb header="randr" extension-xname="RANDR" extension-name="RandR">
 	<!-- Implements version 1.1 of RANDR -->	
-	
+
+	<import>xproto</import>
+
 	<enum name="Rotation">
 		<item name="Rotate_0"><value>1</value></item>
 		<item name="Rotate_90"><value>2</value></item>
diff --git a/src/extensions/render.xml b/src/extensions/render.xml
index 53782c8..a59f7e7 100644
--- a/src/extensions/render.xml
+++ b/src/extensions/render.xml
@@ -7,6 +7,8 @@ for licensing information.
 <xcb header="render" extension-xname="RENDER" extension-name="Render">
   <!-- supports version 0.10 -->
 
+  <import>xproto</import>
+
   <enum name="PictType">
     <item name="Indexed" />
     <item name="Direct" />
diff --git a/src/extensions/screensaver.xml b/src/extensions/screensaver.xml
index b1f49c2..1a095de 100644
--- a/src/extensions/screensaver.xml
+++ b/src/extensions/screensaver.xml
@@ -32,6 +32,8 @@ Draft Standard Version 1.1
 <xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver">
   <!-- Types -->
 
+  <import>xproto</import>
+
   <enum name="Kind">
     <item name="Blanked" />
     <item name="Internal" />
diff --git a/src/extensions/shape.xml b/src/extensions/shape.xml
index 8afbff7..36d0652 100644
--- a/src/extensions/shape.xml
+++ b/src/extensions/shape.xml
@@ -27,6 +27,8 @@ authorization from the authors.
 -->
 <!-- This file describes version 1.1 of the Shape extension. -->
 <xcb header="shape" extension-xname="SHAPE" extension-name="Shape">
+  <import>xproto</import>
+
   <typedef oldname="CARD8" newname="OP" />
   <typedef oldname="CARD8" newname="KIND" />
 
diff --git a/src/extensions/shm.xml b/src/extensions/shm.xml
index 28e8e1e..e576c1f 100644
--- a/src/extensions/shm.xml
+++ b/src/extensions/shm.xml
@@ -26,6 +26,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <xcb header="shm" extension-xname="MIT-SHM" extension-name="Shm">
+  <import>xproto</import>
+
   <xidtype name="SEG" />
 
   <event name="Completion" number="0">
diff --git a/src/extensions/sync.xml b/src/extensions/sync.xml
index 69b957d..6efca36 100644
--- a/src/extensions/sync.xml
+++ b/src/extensions/sync.xml
@@ -5,6 +5,8 @@ All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
 <xcb header="sync" extension-xname="SYNC" extension-name="Sync">
+  <import>xproto</import>
+
   <xidtype name="ALARM" />
 
   <enum name="ALARMSTATE">
diff --git a/src/extensions/xfixes.xml b/src/extensions/xfixes.xml
index 9bd14e3..9f890cb 100644
--- a/src/extensions/xfixes.xml
+++ b/src/extensions/xfixes.xml
@@ -26,6 +26,7 @@ authorization from the authors.
 -->
 <!-- This file describes version 4 of XFixes. -->
 <xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
+  <import>xproto</import>
   <import>render</import>
   <import>shape</import>
 
diff --git a/src/extensions/xprint.xml b/src/extensions/xprint.xml
index 5fc8923..11cd7c0 100644
--- a/src/extensions/xprint.xml
+++ b/src/extensions/xprint.xml
@@ -27,8 +27,9 @@ authorization from the authors.
 -->
 
 <xcb header="xprint" extension-xname="XpExtension" extension-name="XP">
-
     <!-- Conforms to XPRINT 1.0 -->
+
+    <import>xproto</import>
     
     <!-- Types -->
     <struct name="PRINTER">
diff --git a/src/extensions/xtest.xml b/src/extensions/xtest.xml
index 3ec0204..72adf0b 100644
--- a/src/extensions/xtest.xml
+++ b/src/extensions/xtest.xml
@@ -27,8 +27,9 @@ authorization from the authors.
 -->
 
 <xcb header="xtest" extension-xname="XTEST" extension-name="Test">
-
     <!-- Conforms to XTEST 2.1 -->
+
+    <import>xproto</import>
     
     <!-- Requests -->
     <request name="GetVersion" opcode="0">
diff --git a/src/extensions/xv.xml b/src/extensions/xv.xml
index 6544e30..b232dea 100644
--- a/src/extensions/xv.xml
+++ b/src/extensions/xv.xml
@@ -27,6 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="xv" extension-xname="XVideo" extension-name="Xv">
+    <import>xproto</import>
     <import>shm</import>
     <!-- Implements version 2.2 of XV -->
 
-- 
2.34.1