From 3238d3d0aeb328aeee150b994904d3d5ed4fc10a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 2 Feb 2011 00:41:42 -0500
Subject: [PATCH] 2.99.3

---
 gtk3-build-fix.patch | 11 +++++++++++
 gtk3.spec            | 14 ++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 gtk3-build-fix.patch

diff --git a/gtk3-build-fix.patch b/gtk3-build-fix.patch
new file mode 100644
index 0000000..4da6698
--- /dev/null
+++ b/gtk3-build-fix.patch
@@ -0,0 +1,11 @@
+diff -up gtk+-2.99.3/gtk/Makefile.in.build-fix gtk+-2.99.3/gtk/Makefile.in
+--- gtk+-2.99.3/gtk/Makefile.in.build-fix	2011-02-02 00:37:00.362804590 -0500
++++ gtk+-2.99.3/gtk/Makefile.in	2011-02-02 00:37:08.668700753 -0500
+@@ -2903,7 +2903,6 @@ stamp-icons: $(STOCK_ICONS)
+ 	&& touch stamp-icons
+ 
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ 	$(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index		\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
diff --git a/gtk3.spec b/gtk3.spec
index 61d6f0f..f54354d 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -18,6 +18,7 @@ URL: http://www.gtk.org
 #VCS: git:git://git.gnome.org/gtk+
 Source: http://download.gnome.org/sources/gtk+/2.99/gtk+-%{version}.tar.bz2
 Source1: im-cedilla.conf
+Patch0: gtk3-build-fix.patch
 
 BuildRequires: gnome-common autoconf automake intltool gettext
 BuildRequires: atk-devel >= %{atk_version}
@@ -110,16 +111,21 @@ widget toolkit.
 
 %prep
 %setup -q -n gtk+-%{version}
+%patch0 -p1 -b .build-fix
 
 %build
 
-# For the gobject-introspection patch
-autoreconf -f
-
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS \
-        --with-xinput \
         --enable-gtk2-dependency \
+        --enable-xkb \
+        --enable-xinerama \
+        --enable-xinput \
+        --enable-xrandr \
+        --enable-xfixes \
+        --enable-xcomposite \
+        --enable-xdamage \
+        --enable-x11-backend \
 )
 
 # fight unused direct deps