[gtk3] - Update to 2.90.7

[Bastien Nocera]

commit 7da5f6e9a8c83e2d60ecc7e248f8a44014d18a44
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Sep 20 14:31:36 2010 +0100

    - Update to 2.90.7

 .gitignore                                       |    1 +
 0001-New-tooltip-style.patch                     |  337 ----------------------
 0001-Prevent-concurrent-use-of-GTK-2-and-3.patch |   49 ----
 gtk-lib64.patch                                  |   66 -----
 gtk3.spec                                        |   23 +-
 icon-padding.patch                               |  258 -----------------
 lower-gi-deps.patch                              |   34 +++
 remove-connecting-reason.patch                   |   18 --
 sources                                          |    2 +-
 window-dragging.patch                            |  124 --------
 10 files changed, 45 insertions(+), 867 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26ea574..389bea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gtk+-2.90.5.tar.bz2
+/gtk+-2.90.7.tar.bz2
diff --git a/gtk3.spec b/gtk3.spec
index cdabf38..7f69979 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -4,14 +4,14 @@
 %global cairo_version 1.6.0-1
 %global libpng_version 2:1.2.2-16
 %global xrandr_version 1.2.99.4-2
-%global gobject_introspection_version 0.6.7
+%global gobject_introspection_version 0.9.3
 
 %global bin_version 3.0.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 2.90.5
-Release: 5%{?dist}
+Version: 2.90.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -20,16 +20,9 @@ Source: http://download.gnome.org/sources/gtk+/2.90/gtk+-%{version}.tar.bz2
 Source3: im-cedilla.conf
 
 Patch0: system-python.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=583273
-Patch1: 0001-New-tooltip-style.patch
-# http://bugzilla.redhat.com/show_bug.cgi?id=529364
-Patch2: remove-connecting-reason.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=611313
-Patch3: window-dragging.patch
-
-# upstream change
-Patch4: 0001-Prevent-concurrent-use-of-GTK-2-and-3.patch
 
+# http://git.gnome.org/browse/gtk+/patch/?id=bf2a7ee1b6c17129861df2e9816d453d4870d5c8
+Patch1: lower-gi-deps.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -115,8 +108,7 @@ widget toolkit.
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1 -b .system-python
-%patch1 -p1 -b .fresh-tooltips
-%patch3 -p1 -b .window-dragging
+%patch1 -p1 -b .lower-gi-deps
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -263,6 +255,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %doc tmpdocs/examples
 
 %changelog
+* Mon Sep 20 2010 Bastien Nocera <bnocera at redhat.com> 2.90.7-1
+- Update to 2.90.7
+
 * Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.90.5-5
 - Co-own /usr/share/gtk-doc
 - gtk3-devel requires gdk-pixbuf2-devel
diff --git a/lower-gi-deps.patch b/lower-gi-deps.patch
new file mode 100644
index 0000000..5968dd6
--- /dev/null
+++ b/lower-gi-deps.patch
@@ -0,0 +1,34 @@
+From bf2a7ee1b6c17129861df2e9816d453d4870d5c8 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Wed, 15 Sep 2010 02:01:00 +0000
+Subject: introspection: Only use 0.9.3 API
+
+---
+diff --git a/configure.ac b/configure.ac
+index 71477e4..3d58578 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1534,7 +1534,7 @@ fi
+ # GObject introspection
+ ##################################################
+ 
+-GOBJECT_INTROSPECTION_CHECK([0.9.5])
++GOBJECT_INTROSPECTION_CHECK([0.9.3])
+ 
+ ##################################################
+ # Checks for gtk-doc and docbook-tools
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index 39242cf..dca2456 100644
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -226,7 +226,7 @@ x11_introspection_files = 		\
+         x11/gdkx.h
+ 
+ GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
+-GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
++GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
+ GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+ GdkX11_3_0_gir_LIBS = $(gdktargetlib)
+ GdkX11_3_0_gir_FILES = $(x11_introspection_files)
+--
+cgit v0.8.3.1
diff --git a/sources b/sources
index 171829e..f2a058c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d569950325c2fb0c68a94fd9265d876  gtk+-2.90.5.tar.bz2
+daf051b3ed6647de6dc48ac40188c50f  gtk+-2.90.7.tar.bz2