SOURCES: gtk+2-arch_confdir.patch (NEW) - from AC-branch

[glen]

Author: glen                         Date: Fri Mar 21 22:32:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from AC-branch

---- Files affected:
SOURCES:
   gtk+2-arch_confdir.patch (1.1 -> 1.2)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gtk+2-arch_confdir.patch
diff -u /dev/null SOURCES/gtk+2-arch_confdir.patch:1.2
--- /dev/null	Fri Mar 21 23:32:34 2008
+++ SOURCES/gtk+2-arch_confdir.patch	Fri Mar 21 23:32:28 2008
@@ -0,0 +1,85 @@
+--- gtk+-2.8.12/gdk-pixbuf/gdk-pixbuf-io.c	2005-10-03 17:11:49.000000000 +0200
++++ gtk+-2.8.12.arch_confdir/gdk-pixbuf/gdk-pixbuf-io.c	2006-02-20 22:10:52.000000000 +0100
+@@ -276,7 +276,7 @@
+   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, "gdk-pixbuf.loaders", NULL);
+ 
+   return result;
+ }
+--- gtk+-2.8.12/gdk-pixbuf/Makefile.am	2005-10-26 20:13:22.000000000 +0200
++++ gtk+-2.8.12.arch_confdir/gdk-pixbuf/Makefile.am	2006-02-20 22:10:21.000000000 +0100
+@@ -467,8 +468,8 @@
+ # after the libraries are installed in their final locations.
+ install-data-hook: install-ms-lib install-def-file
+ 	@if $(RUN_QUERY_LOADER_TEST) ; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders ; \
+ 	else \
+ 	  echo "***" ; \
+ 	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+@@ -479,7 +480,7 @@
+ 	fi
+ 
+ uninstall-local: uninstall-ms-lib uninstall-def-file
+-	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
++	rm -f $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders
+ 
+ if CROSS_COMPILING
+ else
+--- gtk+-2.8.12/gtk/gtkrc.c	2005-11-23 15:24:51.000000000 +0100
++++ gtk+-2.8.12.arch_confdir/gtk/gtkrc.c	2006-02-20 22:14:36.000000000 +0100
+@@ -364,7 +364,7 @@
+       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.immodules", NULL);
+     }
+ 
+   return result;
+#--- gtk+-2.8.12/gtk-zip.sh.in	2006-02-07 23:57:06.000000000 +0100
+#+++ gtk+-2.8.12.arch_confdir/gtk-zip.sh.in	2006-02-20 22:12:22.000000000 +0100
+#@@ -9,9 +9,9 @@
+# 
+# zip $ZIP -@ <<EOF
+# COPYING.LIB-2
+#-etc/gtk-2.0/gdk-pixbuf.loaders
+#-etc/gtk-2.0/gtkrc
+#-etc/gtk-2.0/gtk.immodules
+#+etc/gtk-2.0- at ARCH@/gdk-pixbuf.loaders
+#+etc/gtk-2.0- at ARCH@/gtkrc
+#+etc/gtk-2.0- at ARCH@/gtk.immodules
+# bin/libgdk_pixbuf- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
+# bin/libgdk-win32- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
+# bin/libgtk-win32- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
+--- gtk+-2.8.12/modules/input/Makefile.am	2005-06-05 00:08:50.000000000 +0200
++++ gtk+-2.8.12.arch_confdir/modules/input/Makefile.am	2006-02-20 22:14:07.000000000 +0100
+@@ -101,10 +102,10 @@
+ # after the libraries are installed in their final locations.
+ install-data-hook:
+ 	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
+-	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
+-	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
++	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules" ; \
++	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules ; \
+ 	else \
+ 	  echo "***" ; \
+ 	  echo "*** Warning: gtk.immodules not built" ; \
+@@ -115,7 +116,7 @@
+         fi
+ 
+ uninstall-local:
+-	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
++	rm -f $(DESTDIR)$(sysconfdir)/gtk.immodules
+ 
+ module_LTLIBRARIES =				\
+ 	$(IM_XIM_MODULE)			\
================================================================