rpms/gtk2/devel gtk2.spec, 1.114, 1.115 render-avoid-repeat.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5033

Modified Files:
	gtk2.spec render-avoid-repeat.patch 
Log Message:
Remove debug spew



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gtk2.spec	3 Feb 2006 05:21:58 -0000	1.114
+++ gtk2.spec	3 Feb 2006 05:28:12 -0000	1.115
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -92,7 +92,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
 %patch3 -p1 -b .set-invisible-char-to-bullet
-%patch4 -p0 -b .render-avoid-repeat
+%patch4 -p1 -b .render-avoid-repeat
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -262,7 +262,7 @@
 %doc tmpdocs/examples
 
 %changelog
-* Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-2
+* Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-3
 - Avoid a slowpath in XRender
 
 * Fri Jan 27 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-1

render-avoid-repeat.patch:
 gdkwindow.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletion(-)

Index: render-avoid-repeat.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/render-avoid-repeat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- render-avoid-repeat.patch	3 Feb 2006 05:21:59 -0000	1.1
+++ render-avoid-repeat.patch	3 Feb 2006 05:28:12 -0000	1.2
@@ -1,11 +1,6 @@
-Index: gdk/gdkwindow.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
-retrieving revision 1.180
-diff -u -p -r1.180 gdkwindow.c
---- gdk/gdkwindow.c	10 Nov 2005 12:09:40 -0000	1.180
-+++ gdk/gdkwindow.c	3 Feb 2006 05:13:28 -0000
-@@ -1751,6 +1751,10 @@ gdk_window_set_bg_pattern (GdkWindow    
+--- gtk+-2.8.11/gdk/gdkwindow.c.render-avoid-repeat	2005-09-26 16:28:34.000000000 -0400
++++ gtk+-2.8.11/gdk/gdkwindow.c	2006-02-03 00:27:26.000000000 -0500
+@@ -1746,6 +1746,10 @@
      {
        cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
        cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
@@ -16,7 +11,7 @@
        cairo_surface_destroy (surface);
  
        if (x_offset != 0 || y_offset != 0)
-@@ -1760,7 +1764,25 @@ gdk_window_set_bg_pattern (GdkWindow    
+@@ -1755,7 +1759,19 @@
  	  cairo_pattern_set_matrix (pattern, &matrix);
  	}
  
@@ -32,13 +27,7 @@
 +			     &window_width, &window_height);
 +      if (x_offset != 0 || y_offset != 0 ||
 +	  pixmap_width < window_width || pixmap_height < window_height)
-+	{
-+	  g_print ("%d %d %d %d %d %d, repeating\n",
-+		   x_offset, y_offset,
-+		   pixmap_width, pixmap_height,
-+		   window_width, window_height);
-+	  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-+	}
++        cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
 +
        cairo_set_source (cr, pattern);
        cairo_pattern_destroy (pattern);