--- a/ChangeLog	Wed Aug 12 14:37:33 2009 +0000
+++ b/ChangeLog	Wed Aug 12 15:04:45 2009 +0000
@@ -1,3 +1,8 @@
+2009-08-12  Christian Kelly  <[email protected]>
+
+	* base-specs/gtk2.spec: Bump to 2.17.7.
+	* gtk+-12-never-invalidate-root.diff: Remove, upstream.
+
 2009-08-12  Christian Kelly  <[email protected]>
 
 	* SUNWhamster.spec: Bump to 2.27.90.

--- a/base-specs/gtk2.spec	Wed Aug 12 14:37:33 2009 +0000
+++ b/base-specs/gtk2.spec	Wed Aug 12 15:04:45 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gtk2
 License:      LGPL
 Group:        System/Libraries
-Version:      2.17.6
+Version:      2.17.7
 Release:      3
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -43,8 +43,6 @@
 Patch10:      gtk+-10-fix-deprecated.diff
 # date:2008-01-11 bugster:6630867 bugzilla:505857 owner:erwannc type:bug
 Patch11:      gtk+-11-filechooser-enterkey.diff
-# date:2009-08-10 bugzilla:589369 doo:10494,10495 owner:yippi type:bug state:usptream
-Patch12:      gtk+-12-never-invalidate-root.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -125,7 +123,6 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 %build
 %ifos linux
@@ -230,6 +227,9 @@
 %{_mandir}/man3/*.gz
 
 %changelog -n gtk2
+* Wed Aug 12 2009 - [email protected]
+- Bump to 2.27.7.
+- Remove gtk+-12-never-invalidate-root.diff, upstream.
 * Mon Aug 10 2009 - [email protected]
 - Add gtk+-12-never-invalidate-root.diff to fix bug #589369, which was 
   affecting the new GDM and causing the background to never get repainted.

--- a/patches/gtk+-12-never-invalidate-root.diff	Wed Aug 12 14:37:33 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gtk+-2.17.6/gdk/gdkwindow.c-orig	2009-08-10 16:07:22.631899000 -0500
-+++ gtk+-2.17.6/gdk/gdkwindow.c	2009-08-10 16:09:00.743470000 -0500
-@@ -5069,7 +5069,8 @@ gdk_window_invalidate_maybe_recurse (Gdk
- 
-   if (private->input_only ||
-       !private->viewable ||
--      gdk_region_empty (region))
-+      gdk_region_empty (region) ||
-+      private->window_type == GDK_WINDOW_ROOT)
-     return;
- 
-   visible_region = gdk_drawable_get_visible_region (window);