[gnome-ostree] 3.6: Add patch to unbreak xorg-driver-xf86-video-intel build

[Colin Walters <walters src gnome org>]

commit f7845b1d738a86534b783c634c626e9582522e82
Author: Colin Walters <walters verbum org>
Date:   Mon Sep 24 20:30:54 2012 -0400

    3.6: Add patch to unbreak xorg-driver-xf86-video-intel build
    
    Sent upstream.

 gnomeos-3.6.json                                   |    3 +-
 ...-mibstore.h-which-is-now-gone-from-X-serv.patch |   64 ++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 698f84a..7297fcc 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -405,7 +405,8 @@
 		 "patches": ["xorg-autogen.patch"]},
 
 		{"src": "fd:xorg/driver/xf86-video-intel",
-		 "patches": ["xorg-autogen.patch"]},
+		 "patches": ["xorg-autogen.patch",
+			     "xorg-driver-xf86-video-intel-Drop-use-of-mibstore.h-which-is-now-gone-from-X-serv.patch"]},
 
 		{"src": "fd:xorg/driver/xf86-video-vesa",
 		 "patches": ["xorg-autogen.patch"]},
diff --git a/patches/xorg-driver-xf86-video-intel-Drop-use-of-mibstore.h-which-is-now-gone-from-X-serv.patch b/patches/xorg-driver-xf86-video-intel-Drop-use-of-mibstore.h-which-is-now-gone-from-X-serv.patch
new file mode 100644
index 0000000..d893fe6
--- /dev/null
+++ b/patches/xorg-driver-xf86-video-intel-Drop-use-of-mibstore.h-which-is-now-gone-from-X-serv.patch
@@ -0,0 +1,64 @@
+From 16ef7058c647cd8c77922b16a981bb1632daaf33 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Mon, 24 Sep 2012 20:27:48 -0400
+Subject: [PATCH] Drop use of mibstore.h, removed from X server
+
+See this X commit: 1cb0261ef54b7dd6a7ef84e1c3959e424706228b
+---
+ src/intel_driver.c            | 1 -
+ src/legacy/i810/i810_driver.c | 1 -
+ src/sna/sna_driver.c          | 1 -
+ uxa/uxa-priv.h                | 1 -
+ 4 files changed, 4 deletions(-)
+
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 41f0311..ec887aa 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -50,7 +50,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "xf86cmap.h"
+ #include "xf86drm.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+ #include "shadowfb.h"
+diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
+index fc6369e..8b2a470 100644
+--- a/src/legacy/i810/i810_driver.c
++++ b/src/legacy/i810/i810_driver.c
+@@ -58,7 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "xf86cmap.h"
+ 
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index aa4031c..223387d 100644
+--- a/src/sna/sna_driver.c
++++ b/src/sna/sna_driver.c
+@@ -51,7 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include <mi.h>
+ #include <micmap.h>
+ #include <mipict.h>
+-#include <mibstore.h>
+ 
+ #include "compiler.h"
+ #include "sna.h"
+diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
+index 91ef4e0..3f639e7 100644
+--- a/uxa/uxa-priv.h
++++ b/uxa/uxa-priv.h
+@@ -44,7 +44,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+-- 
+1.7.11.4
+