rpms/gtk2/F-9 gtk+-2.12.12-lib64.patch, NONE, 1.1 .cvsignore, 1.86, 1.87 gtk2.spec, 1.297, 1.298 sources, 1.94, 1.95

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1417

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	gtk+-2.12.12-lib64.patch 
Log Message:
2.12.12


gtk+-2.12.12-lib64.patch:

--- NEW FILE gtk+-2.12.12-lib64.patch ---
diff -up gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2008-09-12 20:00:46.000000000 -0400
+++ gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c	2008-09-13 00:55:30.000000000 -0400
@@ -277,7 +277,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.12.12/gdk-pixbuf/Makefile.am.lib64 gtk+-2.12.12/gdk-pixbuf/Makefile.am
--- gtk+-2.12.12/gdk-pixbuf/Makefile.am.lib64	2008-09-12 20:00:46.000000000 -0400
+++ gtk+-2.12.12/gdk-pixbuf/Makefile.am	2008-09-13 00:57:52.000000000 -0400
@@ -311,6 +311,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.12.12/gtk/gtkrc.c.lib64 gtk+-2.12.12/gtk/gtkrc.c
--- gtk+-2.12.12/gtk/gtkrc.c.lib64	2008-09-12 20:00:39.000000000 -0400
+++ gtk+-2.12.12/gtk/gtkrc.c	2008-09-13 00:59:26.000000000 -0400
@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
       if (im_module_file)
 	result = g_strdup (im_module_file);
       else
-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+       {
+         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, 
+                                    "gtk.immodules", NULL);
+         if (!g_file_test (result, G_FILE_TEST_EXISTS))
+           {
+             g_free (result);
+             
+             result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+                                        "gtk.immodules", NULL);
+           }
+       }
     }
 
   return result;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	1 Jul 2008 22:05:46 -0000	1.86
+++ .cvsignore	13 Sep 2008 05:04:06 -0000	1.87
@@ -1 +1 @@
-gtk+-2.12.11.tar.bz2
+gtk+-2.12.12.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- gtk2.spec	8 Sep 2008 12:52:37 -0000	1.297
+++ gtk2.spec	13 Sep 2008 05:04:06 -0000	1.298
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.12.11
+%define base_version 2.12.12
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -30,7 +30,7 @@
 Source8: gtk-print-warning-24x24.png
 
 # Biarch changes
-Patch0: gtk+-2.4.1-lib64.patch
+Patch0: gtk+-2.12.12-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 # a workaround for some brokenness in the flash plugin
@@ -49,12 +49,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=204621
 Patch13: printer-paper-size.patch
 
-# fixed upstream
 Patch14: empty-modmap-crash.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=455742
-Patch15: cups-unix-domain-socket.patch
-
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -136,7 +132,6 @@
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
 %patch13 -p0 -b .printer-paper-size
-%patch15 -p0 -b .cuds
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -329,6 +324,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sat Sep 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.12-1
+- Update to 2.12.12
+
 * Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
 - Add a comment of the Unix domain socket connection with CUPS
   and a little modification of the previous patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	1 Jul 2008 22:05:46 -0000	1.94
+++ sources	13 Sep 2008 05:04:06 -0000	1.95
@@ -1,4 +1,4 @@
-f7aab88e856a813386f797aade5867ad  gtk+-2.12.11.tar.bz2
+8b2df21ce70bd8e75a45889aaf0a948e  gtk+-2.12.12.tar.bz2
 64fc4a111e35939a1aee880c96351521  gtk-print-error-16x16.png
 a6b427ab6a030a298f64d23a1343b646  gtk-print-report-16x16.png
 66f36ea922eb1c39582dee559f995331  gtk-print-warning-16x16.png