rpms/gtk2/devel gtk-lib64.patch,1.1,1.2 gtk2.spec,1.437,1.438

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5642

Modified Files:
	gtk-lib64.patch gtk2.spec 
Log Message:
update patches


gtk-lib64.patch:
 gtkrc.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Index: gtk-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk-lib64.patch	1 Dec 2009 02:34:02 -0000	1.1
+++ gtk-lib64.patch	28 Jun 2010 16:10:30 -0000	1.2
@@ -1,47 +1,3 @@
-diff -up gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c
---- gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2009-11-30 13:10:35.000000000 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c	2009-11-30 20:54:21.842859303 -0500
-@@ -305,7 +305,17 @@ gdk_pixbuf_get_module_file (void)
-   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
- 
-   if (!result)
--	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+  {
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
-+				     HOST, "gdk-pixbuf.loaders", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	  {
-+		  g_free (result);
-+		  
-+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
-+					     "gdk-pixbuf.loaders", NULL);
-+	  }
-+  }
- 
-   return result;
- }
-diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.am
---- gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64	2009-11-26 01:35:49.000000000 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/Makefile.am	2009-11-30 20:54:21.842859303 -0500
-@@ -521,6 +521,7 @@ INCLUDES = \
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"              \
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DGTK_PREFIX=\"$(prefix)\"		\
-diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.in
---- gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64	2009-11-30 20:54:58.058857713 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/Makefile.in	2009-11-30 20:55:21.902591753 -0500
-@@ -1344,6 +1344,7 @@ INCLUDES = \
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"              \
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DGTK_PREFIX=\"$(prefix)\"		\
 diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
 --- gtk+-2.19.1/gtk/gtkrc.c.lib64	2009-11-26 01:35:50.000000000 -0500
 +++ gtk+-2.19.1/gtk/gtkrc.c	2009-11-30 20:54:21.844826383 -0500


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -p -r1.437 -r1.438
--- gtk2.spec	28 Jun 2010 15:45:46 -0000	1.437
+++ gtk2.spec	28 Jun 2010 16:10:30 -0000	1.438
@@ -37,8 +37,6 @@ Patch2: icon-padding.patch
 Patch4: fresh-tooltips.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599618
 Patch8: tooltip-positioning.patch
-# http://bugzilla.redhat.com/show_bug.cgi?id=529364
-Patch11: gtk2-remove-connecting-reason.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=592582
 #Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
@@ -158,7 +156,6 @@ This package contains developer document
 %patch2 -p1 -b .icon-padding
 %patch4 -p1 -b .fresh-tooltips
 %patch8 -p1 -b .tooltip-positioning
-%patch11 -p1 -b .remove-connecting-reason
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging