From f00236d66a884f06adf5cc6d9124e385c21c89764c3a1c989575916eafbce51d Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 15 Jan 2010 01:29:45 +0000
Subject: [PATCH 1/9] Accepting request 29355 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 29355 revision 2.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/29355
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=88
---
 gtk+-2.19.2.tar.bz2    |  3 ---
 gtk+-2.19.3.tar.bz2    |  3 +++
 gtk2-gdk-typelib.patch | 26 --------------------------
 gtk2.changes           | 36 ++++++++++++++++++++++++++++++++++++
 gtk2.spec              |  7 ++-----
 5 files changed, 41 insertions(+), 34 deletions(-)
 delete mode 100644 gtk+-2.19.2.tar.bz2
 create mode 100644 gtk+-2.19.3.tar.bz2
 delete mode 100644 gtk2-gdk-typelib.patch

diff --git a/gtk+-2.19.2.tar.bz2 b/gtk+-2.19.2.tar.bz2
deleted file mode 100644
index 7ab003a..0000000
--- a/gtk+-2.19.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36727abfe7cef80c67d07f64eae38bc57deb980571999ab2ba7ff9d73d8b0a1f
-size 18706954
diff --git a/gtk+-2.19.3.tar.bz2 b/gtk+-2.19.3.tar.bz2
new file mode 100644
index 0000000..60652ac
--- /dev/null
+++ b/gtk+-2.19.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60ab4e5df560f4d700b3d89ce5fb053895332986e3cfdead129d93cbff18cc50
+size 18519756
diff --git a/gtk2-gdk-typelib.patch b/gtk2-gdk-typelib.patch
deleted file mode 100644
index a4a3a5f..0000000
--- a/gtk2-gdk-typelib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: gtk+-2.19.2/gdk/Makefile.am
-===================================================================
---- gtk+-2.19.2.orig/gdk/Makefile.am
-+++ gtk+-2.19.2/gdk/Makefile.am
-@@ -211,7 +211,7 @@ girdir = $(INTROSPECTION_GIRDIR)
- dist_gir_DATA = $(INTROSPECTION_GIRS)
- 
- typelibsdir = $(INTROSPECTION_TYPELIBDIR)
--typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- 
- CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
- endif
-Index: gtk+-2.19.2/gdk/Makefile.in
-===================================================================
---- gtk+-2.19.2.orig/gdk/Makefile.in
-+++ gtk+-2.19.2/gdk/Makefile.in
-@@ -708,7 +708,7 @@ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/
- @HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR)
- @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(INTROSPECTION_TYPELIBDIR)
--@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-+@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
- @OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh
- lib_LTLIBRARIES = $(gdktargetlib)
diff --git a/gtk2.changes b/gtk2.changes
index 5fda4c8..4be5a73 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Tue Jan 12 11:16:10 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.19.3:
+  + GSeal:
+    - Deprecate widget flag macros (GTK_WIDGET_STATE,
+      GTK_WIDGET_SAVED_STATE, GTK_WIDGET_FLAGS,
+      GTK_WIDGET_TOPLEVEL, GTK_WIDGET_NO_WINDOW,
+      GTK_WIDGET_COMPOSITE_CHILD, GTK_WIDGET_APP_PAINTABLE,
+      GTK_WIDGET_CAN_DEFAULT, GTK_WIDGET_CAN_FOCUS,
+      GTK_WIDGET_DOUBLE_BUFFERED, GTK_WIDGET_HAS_DEFAULT,
+      GTK_WIDGET_HAS_GRAB, GTK_WIDGET_RECEIVES_DEFAULT)
+    - Also deprecate the type macros (GTK_WIDGET_TYPE,
+      GTK_OBJECT_TYPE_NAME, GTK_OBJECT_TYPE)
+  + GtkOffscreenWindow: A new toplevel container widget to manage
+    offscreen rendering of child widgets
+  + OS X:
+    - Memory leak fixes and other improvements
+  + Bugs:
+    - bgo#604901: Provide generic offscreen rendering container
+    - bgo#597100: There is a misprint in the documentation...
+    - bgo#598383: GtkWidget::state-changed signal should be
+      documented
+    - bgo#602284: Need a way to retrieve the preedit string in a
+      GtkTextView
+    - bgo#605090: Fix some compilation warnings
+    - bgo#605199: Contradiction in the description of function...
+    - bgo#606068: Setup libjpeg error handling earlier...
+    - bgo#606230: gtk_combo_box_set_active_iter & unsetting the
+      active item
+    - bgo#606291: Fix some issues in "Migrating from
+      GtkOptionMenu...
+    - bgo#606434: prop-editor should support GdkColor
+  + Updated translations.
+- Drop gtk2-gdk-typelib.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Dec 22 13:17:02 CET 2009 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index 74619cb..c18f7cf 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.19.2)
+# spec file for package gtk2 (Version 2.19.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.19.2
+Version:        2.19.3
 Release:        1
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 License:        LGPLv2.1+
@@ -43,8 +43,6 @@ Patch22:        bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
 Patch23:        bugzilla-131498-allow-xim-for-all-languages.patch
 # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch24:        gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
-# PATCH-FIX-UPSTREAM gtk2-gdk-typelib.patch bgo605272 vuntz@opensuse.org -- Fix build of Gdk-2.0.typelib
-Patch25:        gtk2-gdk-typelib.patch
 # Patches taken from upstream or slated to go upstream.  We can expect these to become obsolete
 # in future releases.
 # Please don't delete this comment even if this section is empty -- "# empty" should
@@ -167,7 +165,6 @@ cp -a %{S:2} .
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch53
 gnome-patch-translation-update
 

From 38f5e312becdac8a392dfc654d60f78fd301b027e6334a4d906655a0a8727e5e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sat, 16 Jan 2010 16:39:43 +0000
Subject: [PATCH 2/9] Accepting request 29810 from
 home:anubisg1:branches:GNOME:Factory

Copy from home:anubisg1:branches:GNOME:Factory/gtk2 via accept of submit request 29810 revision 5.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/29810
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=89
---
 gtk2-bad-drawable-errors.patch | 36 ++++++++++++++++++++++++++++++++++
 gtk2.changes                   |  7 +++++++
 gtk2.spec                      |  4 ++++
 3 files changed, 47 insertions(+)
 create mode 100644 gtk2-bad-drawable-errors.patch

diff --git a/gtk2-bad-drawable-errors.patch b/gtk2-bad-drawable-errors.patch
new file mode 100644
index 0000000..ed3b097
--- /dev/null
+++ b/gtk2-bad-drawable-errors.patch
@@ -0,0 +1,36 @@
+From f96e51db46f2196707c0ea44a46f1d67f9a069d4 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Fri, 15 Jan 2010 15:06:12 +0000
+Subject: Avoid drawing implicit paints to destroyed windows
+
+It may happen that a window gets destroyed during painting, if so
+we should not draw the implicit paint double-buffered pixmap to it
+as that will cause a BadDrawable X error.
+
+This fixes bug 600865
+---
+diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
+index eeaee78..9e6b14a 100644
+--- a/gdk/gdkwindow.c
++++ b/gdk/gdkwindow.c
+@@ -2679,7 +2679,7 @@ gdk_window_flush_implicit_paint (GdkWindow *window)
+   gdk_region_offset (region, private->abs_x, private->abs_y);
+   gdk_region_intersect (region, paint->region);
+ 
+-  if (!gdk_region_empty (region))
++  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (region))
+     {
+       /* Remove flushed region from the implicit paint */
+       gdk_region_subtract (paint->region, region);
+@@ -2712,7 +2712,7 @@ gdk_window_end_implicit_paint (GdkWindow *window)
+ 
+   private->implicit_paint = NULL;
+ 
+-  if (!gdk_region_empty (paint->region))
++  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (paint->region))
+     {
+       /* Some regions are valid, push these to window now */
+       tmp_gc = _gdk_drawable_get_scratch_gc ((GdkDrawable *)window, FALSE);
+--
+cgit v0.8.3.1
+
diff --git a/gtk2.changes b/gtk2.changes
index 4be5a73..a041d19 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
+
+-  Add gtk2-bad-drawable-errors.patch, taken from upstream:
+   this is needed to fix crashes in various circumstances.
+   Fix bnc#570941 bgo#600865
+
 -------------------------------------------------------------------
 Tue Jan 12 11:16:10 CET 2010 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index c18f7cf..466949a 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -43,6 +43,8 @@ Patch22:        bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
 Patch23:        bugzilla-131498-allow-xim-for-all-languages.patch
 # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch24:        gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
+# PATCH-FIX-UPSTREAM gtk2-bad-drawable-errors.patch bgo600865 bnc570941 andrea@opensuse.org -- Patch taken from upstream
+Patch25:        gtk2-bad-drawable-errors.patch
 # Patches taken from upstream or slated to go upstream.  We can expect these to become obsolete
 # in future releases.
 # Please don't delete this comment even if this section is empty -- "# empty" should
@@ -165,7 +167,9 @@ cp -a %{S:2} .
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 %patch53
+
 gnome-patch-translation-update
 
 %build

From 298db9977b1d292419d6c3916f0c7a20baf53e6dd6f8666980180a939f920e0f Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sat, 16 Jan 2010 16:40:23 +0000
Subject: [PATCH 3/9] tweak

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=90
---
 gtk2.changes | 2 +-
 gtk2.spec    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gtk2.changes b/gtk2.changes
index a041d19..ca8e24a 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -3,7 +3,7 @@ Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
 
 -  Add gtk2-bad-drawable-errors.patch, taken from upstream:
    this is needed to fix crashes in various circumstances.
-   Fix bnc#570941 bgo#600865
+   Fix bnc#570941, bgo#600865.
 
 -------------------------------------------------------------------
 Tue Jan 12 11:16:10 CET 2010 - vuntz@opensuse.org
diff --git a/gtk2.spec b/gtk2.spec
index 466949a..f5a5783 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -169,7 +169,6 @@ cp -a %{S:2} .
 %patch24 -p1
 %patch25 -p1
 %patch53
-
 gnome-patch-translation-update
 
 %build

From 54fcb18cd0dcae3743ad222da08e587a01f1619648651d884c6c9372767cf5e4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sat, 16 Jan 2010 18:02:51 +0000
Subject: [PATCH 4/9] Accepting request 29862 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 29862 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/29862
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=91
---
 gtk2.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gtk2.spec b/gtk2.spec
index f5a5783..8c262c2 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -20,8 +20,9 @@
 Name:           gtk2
 %define _name gtk+
 Version:        2.19.3
-Release:        1
+# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
+Release:        1
 License:        LGPLv2.1+
 Summary:        Library for Creation of Graphical User Interfaces (version 2)
 Url:            http://www.gtk.org/
@@ -183,7 +184,8 @@ export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
 %configure \
 	--enable-man \
 	--with-xinput=xfree
-make %{?jobs:-j%jobs}
+#make %{?jobs:-j%jobs}
+make
 
 %install
 %makeinstall

From cf43317c6e775fa0b86af06eb8d0f16e28b2ec82bc88d0f3a8befb0a451f4662 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 22 Jan 2010 13:04:16 +0000
Subject: [PATCH 5/9] unbreak

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=92
---
 gtk2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2.spec b/gtk2.spec
index 8c262c2..0e189d6 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gtk2 (Version 2.19.3)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From cc57db962bda492f5a8bf310e423c3c890c4bd85fb7cec895d28aadbb743a161 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 28 Jan 2010 00:01:58 +0000
Subject: [PATCH 6/9] Accepting request 30582 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 30582 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/30582
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=93
---
 gtk+-2.19.3.tar.bz2            |  3 ---
 gtk+-2.19.4.tar.bz2            |  3 +++
 gtk2-bad-drawable-errors.patch | 36 ----------------------------------
 gtk2.changes                   | 35 +++++++++++++++++++++++++++++++++
 gtk2.spec                      |  7 ++-----
 5 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 gtk+-2.19.3.tar.bz2
 create mode 100644 gtk+-2.19.4.tar.bz2
 delete mode 100644 gtk2-bad-drawable-errors.patch

diff --git a/gtk+-2.19.3.tar.bz2 b/gtk+-2.19.3.tar.bz2
deleted file mode 100644
index 60652ac..0000000
--- a/gtk+-2.19.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60ab4e5df560f4d700b3d89ce5fb053895332986e3cfdead129d93cbff18cc50
-size 18519756
diff --git a/gtk+-2.19.4.tar.bz2 b/gtk+-2.19.4.tar.bz2
new file mode 100644
index 0000000..447b144
--- /dev/null
+++ b/gtk+-2.19.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3818418e9ae51dbdffb65edc65b408a1f9318ab2256faf4d3c42dabf2e14417a
+size 18907416
diff --git a/gtk2-bad-drawable-errors.patch b/gtk2-bad-drawable-errors.patch
deleted file mode 100644
index ed3b097..0000000
--- a/gtk2-bad-drawable-errors.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f96e51db46f2196707c0ea44a46f1d67f9a069d4 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Fri, 15 Jan 2010 15:06:12 +0000
-Subject: Avoid drawing implicit paints to destroyed windows
-
-It may happen that a window gets destroyed during painting, if so
-we should not draw the implicit paint double-buffered pixmap to it
-as that will cause a BadDrawable X error.
-
-This fixes bug 600865
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index eeaee78..9e6b14a 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -2679,7 +2679,7 @@ gdk_window_flush_implicit_paint (GdkWindow *window)
-   gdk_region_offset (region, private->abs_x, private->abs_y);
-   gdk_region_intersect (region, paint->region);
- 
--  if (!gdk_region_empty (region))
-+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (region))
-     {
-       /* Remove flushed region from the implicit paint */
-       gdk_region_subtract (paint->region, region);
-@@ -2712,7 +2712,7 @@ gdk_window_end_implicit_paint (GdkWindow *window)
- 
-   private->implicit_paint = NULL;
- 
--  if (!gdk_region_empty (paint->region))
-+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (paint->region))
-     {
-       /* Some regions are valid, push these to window now */
-       tmp_gc = _gdk_drawable_get_scratch_gc ((GdkDrawable *)window, FALSE);
---
-cgit v0.8.3.1
-
diff --git a/gtk2.changes b/gtk2.changes
index ca8e24a..053186c 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Jan 27 13:06:30 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.19.4:
+  + GSeal:
+    - New accessors for GtkEntry windows
+    - New accessors for GtkRange members
+  + Bugs fixed:
+    - bgo#607082 - Add accessors for sealed GtkRange members
+    - bgo#567729 - Add GtkToolPalette
+    - bgo#591102 - Remove the destination file if trying to save a
+                   pixbuf failed
+    - bgo#600865 - Avoid drawing implicit paints to destroyed
+                   windows
+    - bgo#601412 - Fix some issues with action widgets
+    - bgo#603144 - Correct PRC6 and PRC9 envelope sizes
+    - bgo#606009 - weirdness with clipping in abiword - csw
+    - bgo#606698 - Misplaced declaration of
+                   gtk_print_job_set_status
+    - bgo#606761 - pixops.c: variables are declared at middle of
+                   block
+    - bgo#607217 - Mixing calls to _set_markup and _set_text
+                   causes...
+    - bgo#607269 - gtk_label_set_attributes with empty list no
+                   longer...
+    - bgo#607322 - Double-click doesn't work if the item is
+                   selected...
+    - bgo#607687 - Avoid integer overflow in
+                   gdk_rectangle_intersect
+    - bgo#607778 - Add accessors for GtkEntry's windows
+    - bgo#607770 - Leak in GtkTreeView with HildonPannableArea
+    - bgo#603245 - Fix a redraw problem with action widgets
+  + Updated translations.
+- Drop gtk2-bad-drawable-errors.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index 0e189d6..636a7ef 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.19.3)
+# spec file for package gtk2 (Version 2.19.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.19.3
+Version:        2.19.4
 # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 Release:        1
@@ -44,8 +44,6 @@ Patch22:        bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
 Patch23:        bugzilla-131498-allow-xim-for-all-languages.patch
 # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch24:        gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
-# PATCH-FIX-UPSTREAM gtk2-bad-drawable-errors.patch bgo600865 bnc570941 andrea@opensuse.org -- Patch taken from upstream
-Patch25:        gtk2-bad-drawable-errors.patch
 # Patches taken from upstream or slated to go upstream.  We can expect these to become obsolete
 # in future releases.
 # Please don't delete this comment even if this section is empty -- "# empty" should
@@ -168,7 +166,6 @@ cp -a %{S:2} .
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch53
 gnome-patch-translation-update
 

From 258a681e4ba596c835e426d4361d96f04fddb289919b436e115cb56a287eed5b Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 11 Feb 2010 00:33:24 +0000
Subject: [PATCH 7/9] Accepting request 32066 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 32066 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/32066
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=94
---
 gtk+-2.19.4.tar.bz2 |  3 ---
 gtk+-2.19.5.tar.bz2 |  3 +++
 gtk2.changes        | 40 ++++++++++++++++++++++++++++++++++++++++
 gtk2.spec           |  4 ++--
 4 files changed, 45 insertions(+), 5 deletions(-)
 delete mode 100644 gtk+-2.19.4.tar.bz2
 create mode 100644 gtk+-2.19.5.tar.bz2

diff --git a/gtk+-2.19.4.tar.bz2 b/gtk+-2.19.4.tar.bz2
deleted file mode 100644
index 447b144..0000000
--- a/gtk+-2.19.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3818418e9ae51dbdffb65edc65b408a1f9318ab2256faf4d3c42dabf2e14417a
-size 18907416
diff --git a/gtk+-2.19.5.tar.bz2 b/gtk+-2.19.5.tar.bz2
new file mode 100644
index 0000000..d244c13
--- /dev/null
+++ b/gtk+-2.19.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd90ea32cfce0337e91af9fef738e7cc6e894e8825287b6048068551e0749481
+size 18910638
diff --git a/gtk2.changes b/gtk2.changes
index 053186c..1796eb2 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Feb 10 16:09:24 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.19.5:
+  + GSEAL work:
+    - Add accessors for GtkPaned members
+    - Add gtk_widget_style_attach
+    - Seal GtkTextTag
+    - Deprecate GtkCurveType
+    - More GtkWidget flags accessors
+  + Bugs fixed:
+    - bgo#403485: Move docs from tmpl/* to the source files
+    - bgo#556263: Deprecate GtkCurve
+    - bgo#554420: Seal GtkTextTag
+    - bgo#561816: Optimize gtk_paned_set_position notifications
+    - bgo#606288: Not using GtkOptionMenu deprecated symbols in
+                  test file
+    - bgo#607061: GtkPlug socket window is sometimes incorrectly
+                  unref'd
+    - bgo#607344: GtkCalendar: crash when using tooltips via glade
+    - bgo#607885: GtkPaned::handle lack accessor
+    - bgo#608162: gtktoolbutton doesn't create right proxy menu
+                  item...
+    - bgo#608345: wrong reference on
+                  gdk_keymap_translate_keyboard_state
+    - bgo#608370: dnd drag-dest signal handlers don't get correctly
+                  disconn...
+    - bgo#608410: GOK types backwards in text entry fields
+    - bgo#608615: DnD events sent to wrong window
+    - bgo#608807: Marks on GtkScale widgets can overlap
+    - bgo#609188: gdk/directfb: compiler warning in
+                  _gdk_windowing_pointer_grab()
+    - bgo#609191: gdk/directfb: use G_DEFINE_TYPE in
+                  gdkcolor-directfb
+    - bgo#609199: gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
+    - bgo#609201: gdk/directfb: max cursor size is artificially
+                  limited
+    - bgo#591186: GTK Menu Bar is unreadable under Windows 7
+  + Updated translations.
+
 -------------------------------------------------------------------
 Wed Jan 27 13:06:30 CET 2010 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index 636a7ef..81664c3 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.19.4)
+# spec file for package gtk2 (Version 2.19.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.19.4
+Version:        2.19.5
 # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 Release:        1

From 4bd12e1ebea012d5230ff3c0c5543727e546ca0ba7d04327dd4972c6e6c57075 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 11 Feb 2010 18:13:27 +0000
Subject: [PATCH 8/9] checked in (request 32272)

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=95
---
 gtk+-2.19.3.tar.bz2 |  3 ++
 gtk+-2.19.5.tar.bz2 |  3 --
 gtk2.changes        | 82 ---------------------------------------------
 gtk2.spec           | 10 +++---
 4 files changed, 7 insertions(+), 91 deletions(-)
 create mode 100644 gtk+-2.19.3.tar.bz2
 delete mode 100644 gtk+-2.19.5.tar.bz2

diff --git a/gtk+-2.19.3.tar.bz2 b/gtk+-2.19.3.tar.bz2
new file mode 100644
index 0000000..60652ac
--- /dev/null
+++ b/gtk+-2.19.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60ab4e5df560f4d700b3d89ce5fb053895332986e3cfdead129d93cbff18cc50
+size 18519756
diff --git a/gtk+-2.19.5.tar.bz2 b/gtk+-2.19.5.tar.bz2
deleted file mode 100644
index d244c13..0000000
--- a/gtk+-2.19.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd90ea32cfce0337e91af9fef738e7cc6e894e8825287b6048068551e0749481
-size 18910638
diff --git a/gtk2.changes b/gtk2.changes
index 1796eb2..4be5a73 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,85 +1,3 @@
--------------------------------------------------------------------
-Wed Feb 10 16:09:24 CET 2010 - vuntz@opensuse.org
-
-- Update to version 2.19.5:
-  + GSEAL work:
-    - Add accessors for GtkPaned members
-    - Add gtk_widget_style_attach
-    - Seal GtkTextTag
-    - Deprecate GtkCurveType
-    - More GtkWidget flags accessors
-  + Bugs fixed:
-    - bgo#403485: Move docs from tmpl/* to the source files
-    - bgo#556263: Deprecate GtkCurve
-    - bgo#554420: Seal GtkTextTag
-    - bgo#561816: Optimize gtk_paned_set_position notifications
-    - bgo#606288: Not using GtkOptionMenu deprecated symbols in
-                  test file
-    - bgo#607061: GtkPlug socket window is sometimes incorrectly
-                  unref'd
-    - bgo#607344: GtkCalendar: crash when using tooltips via glade
-    - bgo#607885: GtkPaned::handle lack accessor
-    - bgo#608162: gtktoolbutton doesn't create right proxy menu
-                  item...
-    - bgo#608345: wrong reference on
-                  gdk_keymap_translate_keyboard_state
-    - bgo#608370: dnd drag-dest signal handlers don't get correctly
-                  disconn...
-    - bgo#608410: GOK types backwards in text entry fields
-    - bgo#608615: DnD events sent to wrong window
-    - bgo#608807: Marks on GtkScale widgets can overlap
-    - bgo#609188: gdk/directfb: compiler warning in
-                  _gdk_windowing_pointer_grab()
-    - bgo#609191: gdk/directfb: use G_DEFINE_TYPE in
-                  gdkcolor-directfb
-    - bgo#609199: gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
-    - bgo#609201: gdk/directfb: max cursor size is artificially
-                  limited
-    - bgo#591186: GTK Menu Bar is unreadable under Windows 7
-  + Updated translations.
-
--------------------------------------------------------------------
-Wed Jan 27 13:06:30 CET 2010 - vuntz@opensuse.org
-
-- Update to version 2.19.4:
-  + GSeal:
-    - New accessors for GtkEntry windows
-    - New accessors for GtkRange members
-  + Bugs fixed:
-    - bgo#607082 - Add accessors for sealed GtkRange members
-    - bgo#567729 - Add GtkToolPalette
-    - bgo#591102 - Remove the destination file if trying to save a
-                   pixbuf failed
-    - bgo#600865 - Avoid drawing implicit paints to destroyed
-                   windows
-    - bgo#601412 - Fix some issues with action widgets
-    - bgo#603144 - Correct PRC6 and PRC9 envelope sizes
-    - bgo#606009 - weirdness with clipping in abiword - csw
-    - bgo#606698 - Misplaced declaration of
-                   gtk_print_job_set_status
-    - bgo#606761 - pixops.c: variables are declared at middle of
-                   block
-    - bgo#607217 - Mixing calls to _set_markup and _set_text
-                   causes...
-    - bgo#607269 - gtk_label_set_attributes with empty list no
-                   longer...
-    - bgo#607322 - Double-click doesn't work if the item is
-                   selected...
-    - bgo#607687 - Avoid integer overflow in
-                   gdk_rectangle_intersect
-    - bgo#607778 - Add accessors for GtkEntry's windows
-    - bgo#607770 - Leak in GtkTreeView with HildonPannableArea
-    - bgo#603245 - Fix a redraw problem with action widgets
-  + Updated translations.
-- Drop gtk2-bad-drawable-errors.patch: fixed upstream.
-
--------------------------------------------------------------------
-Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
-
--  Add gtk2-bad-drawable-errors.patch, taken from upstream:
-   this is needed to fix crashes in various circumstances.
-   Fix bnc#570941, bgo#600865.
-
 -------------------------------------------------------------------
 Tue Jan 12 11:16:10 CET 2010 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index 81664c3..a4f866b 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.19.5)
+# spec file for package gtk2 (Version 2.19.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,10 +19,9 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.19.5
-# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
-# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
+Version:        2.19.3
 Release:        1
+# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 License:        LGPLv2.1+
 Summary:        Library for Creation of Graphical User Interfaces (version 2)
 Url:            http://www.gtk.org/
@@ -181,8 +180,7 @@ export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
 %configure \
 	--enable-man \
 	--with-xinput=xfree
-#make %{?jobs:-j%jobs}
-make
+make %{?jobs:-j%jobs}
 
 %install
 %makeinstall

From c7e2eb841c05f4a89bbe3523c08e681471f274efa6573de4e4c107b2637dc3ee Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 11 Feb 2010 18:13:28 +0000
Subject: [PATCH 9/9] Updating link to change in openSUSE:Factory/gtk2 revision
 81.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=4d00ba82961dfbeea5c62bbb54e357d8
---
 gtk+-2.19.3.tar.bz2 |  3 --
 gtk+-2.19.5.tar.bz2 |  3 ++
 gtk2.changes        | 82 +++++++++++++++++++++++++++++++++++++++++++++
 gtk2.spec           |  8 +++--
 4 files changed, 90 insertions(+), 6 deletions(-)
 delete mode 100644 gtk+-2.19.3.tar.bz2
 create mode 100644 gtk+-2.19.5.tar.bz2

diff --git a/gtk+-2.19.3.tar.bz2 b/gtk+-2.19.3.tar.bz2
deleted file mode 100644
index 60652ac..0000000
--- a/gtk+-2.19.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60ab4e5df560f4d700b3d89ce5fb053895332986e3cfdead129d93cbff18cc50
-size 18519756
diff --git a/gtk+-2.19.5.tar.bz2 b/gtk+-2.19.5.tar.bz2
new file mode 100644
index 0000000..d244c13
--- /dev/null
+++ b/gtk+-2.19.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd90ea32cfce0337e91af9fef738e7cc6e894e8825287b6048068551e0749481
+size 18910638
diff --git a/gtk2.changes b/gtk2.changes
index 4be5a73..1796eb2 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,85 @@
+-------------------------------------------------------------------
+Wed Feb 10 16:09:24 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.19.5:
+  + GSEAL work:
+    - Add accessors for GtkPaned members
+    - Add gtk_widget_style_attach
+    - Seal GtkTextTag
+    - Deprecate GtkCurveType
+    - More GtkWidget flags accessors
+  + Bugs fixed:
+    - bgo#403485: Move docs from tmpl/* to the source files
+    - bgo#556263: Deprecate GtkCurve
+    - bgo#554420: Seal GtkTextTag
+    - bgo#561816: Optimize gtk_paned_set_position notifications
+    - bgo#606288: Not using GtkOptionMenu deprecated symbols in
+                  test file
+    - bgo#607061: GtkPlug socket window is sometimes incorrectly
+                  unref'd
+    - bgo#607344: GtkCalendar: crash when using tooltips via glade
+    - bgo#607885: GtkPaned::handle lack accessor
+    - bgo#608162: gtktoolbutton doesn't create right proxy menu
+                  item...
+    - bgo#608345: wrong reference on
+                  gdk_keymap_translate_keyboard_state
+    - bgo#608370: dnd drag-dest signal handlers don't get correctly
+                  disconn...
+    - bgo#608410: GOK types backwards in text entry fields
+    - bgo#608615: DnD events sent to wrong window
+    - bgo#608807: Marks on GtkScale widgets can overlap
+    - bgo#609188: gdk/directfb: compiler warning in
+                  _gdk_windowing_pointer_grab()
+    - bgo#609191: gdk/directfb: use G_DEFINE_TYPE in
+                  gdkcolor-directfb
+    - bgo#609199: gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
+    - bgo#609201: gdk/directfb: max cursor size is artificially
+                  limited
+    - bgo#591186: GTK Menu Bar is unreadable under Windows 7
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Jan 27 13:06:30 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.19.4:
+  + GSeal:
+    - New accessors for GtkEntry windows
+    - New accessors for GtkRange members
+  + Bugs fixed:
+    - bgo#607082 - Add accessors for sealed GtkRange members
+    - bgo#567729 - Add GtkToolPalette
+    - bgo#591102 - Remove the destination file if trying to save a
+                   pixbuf failed
+    - bgo#600865 - Avoid drawing implicit paints to destroyed
+                   windows
+    - bgo#601412 - Fix some issues with action widgets
+    - bgo#603144 - Correct PRC6 and PRC9 envelope sizes
+    - bgo#606009 - weirdness with clipping in abiword - csw
+    - bgo#606698 - Misplaced declaration of
+                   gtk_print_job_set_status
+    - bgo#606761 - pixops.c: variables are declared at middle of
+                   block
+    - bgo#607217 - Mixing calls to _set_markup and _set_text
+                   causes...
+    - bgo#607269 - gtk_label_set_attributes with empty list no
+                   longer...
+    - bgo#607322 - Double-click doesn't work if the item is
+                   selected...
+    - bgo#607687 - Avoid integer overflow in
+                   gdk_rectangle_intersect
+    - bgo#607778 - Add accessors for GtkEntry's windows
+    - bgo#607770 - Leak in GtkTreeView with HildonPannableArea
+    - bgo#603245 - Fix a redraw problem with action widgets
+  + Updated translations.
+- Drop gtk2-bad-drawable-errors.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
+
+-  Add gtk2-bad-drawable-errors.patch, taken from upstream:
+   this is needed to fix crashes in various circumstances.
+   Fix bnc#570941, bgo#600865.
+
 -------------------------------------------------------------------
 Tue Jan 12 11:16:10 CET 2010 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index a4f866b..1375a99 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.19.3)
+# spec file for package gtk2 (Version 2.19.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,9 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.19.3
+Version:        2.19.5
 Release:        1
+# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 License:        LGPLv2.1+
 Summary:        Library for Creation of Graphical User Interfaces (version 2)
@@ -180,7 +181,8 @@ export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
 %configure \
 	--enable-man \
 	--with-xinput=xfree
-make %{?jobs:-j%jobs}
+#make %{?jobs:-j%jobs}
+make
 
 %install
 %makeinstall