gtk+3-arch_confdir.patch

   1 diff -urN gtk+-2.90.0/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.90.0.new//gdk-pixbuf/gdk-pixbuf-io.c
   2 --- gtk+-2.90.0/gdk-pixbuf/gdk-pixbuf-io.c      2010-05-10 15:16:31.000000000 +0200
   3 +++ gtk+-2.90.0.new//gdk-pixbuf/gdk-pixbuf-io.c 2010-05-11 21:26:17.709131700 +0200
   4 @@ -305,7 +305,7 @@
   5    gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
   6
   7    if (!result)
   8 -         result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gdk-pixbuf.loaders", NULL);
   9 +         result = g_build_filename (GTK_SYSCONFDIR, "gdk-pixbuf.loaders", NULL);
  10
  11    return result;
  12  }
  13 diff -urN gtk+-2.90.0/gdk-pixbuf/Makefile.am gtk+-2.90.0.new//gdk-pixbuf/Makefile.am
  14 --- gtk+-2.90.0/gdk-pixbuf/Makefile.am  2010-05-08 07:29:27.000000000 +0200
  15 +++ gtk+-2.90.0.new//gdk-pixbuf/Makefile.am     2010-05-11 21:28:51.504925644 +0200
  16 @@ -710,8 +710,8 @@
  17  # after the libraries are installed in their final locations.
  18  install-data-hook: install-ms-lib install-def-file
  19         @if $(RUN_QUERY_LOADER_TEST) ; then \
  20 -         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
  21 -         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders ; \
  22 +         $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
  23 +         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders ; \
  24         else \
  25           echo "***" ; \
  26           echo "*** Warning: gdk-pixbuf.loaders not built" ; \
  27 @@ -722,7 +722,7 @@
  28         fi
  29
  30  uninstall-local: uninstall-ms-lib uninstall-def-file
  31 -       rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders
  32 +       rm -f $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders
  33
  34  if CROSS_COMPILING
  35  else
  36 diff -urN gtk+-2.90.0/gtk/gtkrc.c gtk+-2.90.0.new//gtk/gtkrc.c
  37 --- gtk+-2.90.0/gtk/gtkrc.c     2010-05-10 15:16:31.000000000 +0200
  38 +++ gtk+-2.90.0.new//gtk/gtkrc.c        2010-05-11 21:30:31.095772815 +0200
  39 @@ -452,7 +452,7 @@
  40        if (im_module_file)
  41         result = g_strdup (im_module_file);
  42        else
  43 -       result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtk.immodules", NULL);
  44 +       result = g_build_filename (GTK_SYSCONFDIR, "gtk.immodules", NULL);
  45      }
  46
  47    return result;
  48 diff -urN gtk+-2.90.0/gtk-zip.sh.in gtk+-2.90.0.new//gtk-zip.sh.in
  49 --- gtk+-2.90.0/gtk-zip.sh.in   2010-05-10 21:57:30.000000000 +0200
  50 +++ gtk+-2.90.0.new//gtk-zip.sh.in      2010-05-11 21:32:08.524884752 +0200
  51 @@ -17,10 +17,10 @@
  52
  53  rm $ZIP
  54  zip $ZIP -@ <<EOF
  55 -etc/gtk-@GTK_API_VERSION@/gdk-pixbuf.loaders
  56 -etc/gtk-@GTK_API_VERSION@/gtkrc
  57 -etc/gtk-@GTK_API_VERSION@/gtk.immodules
  58 -etc/gtk-@GTK_API_VERSION@/im-multipress.conf
  59 +etc/gtk-@GTK_API_VERSION@-@ARCH@/gdk-pixbuf.loaders
  60 +etc/gtk-@GTK_API_VERSION@-@ARCH@/gtkrc
  61 +etc/gtk-@GTK_API_VERSION@-@ARCH@/gtk.immodules
  62 +etc/gtk-@GTK_API_VERSION@-@ARCH@/im-multipress.conf
  63  bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
  64  bin/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
  65  bin/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
  66 diff -urN gtk+-2.90.0/modules/input/Makefile.am gtk+-2.90.0.new//modules/input/Makefile.am
  67 --- gtk+-2.90.0/modules/input/Makefile.am       2010-05-08 07:29:27.000000000 +0200
  68 +++ gtk+-2.90.0.new//modules/input/Makefile.am  2010-05-11 21:34:23.598223475 +0200
  69 @@ -156,7 +156,7 @@
  70  endif
  71  endif
  72
  73 -multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
  74 +multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)"\"
  75  im_multipress_la_CPPFLAGS = $(multipress_defs)
  76  libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
  77  im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
  78 @@ -172,7 +172,7 @@
  79  MULTIPRESS_MODULE = im-multipress.la
  80  endif
  81
  82 -imconffiledir = $(sysconfdir)/gtk-3.0
  83 +imconffiledir = $(sysconfdir)
  84  dist_imconffile_DATA = im-multipress.conf
  85
  86  if CROSS_COMPILING
  87 @@ -189,10 +189,10 @@
  88  # after the libraries are installed in their final locations.
  89  install-data-hook:
  90         @if $(RUN_QUERY_IMMODULES_TEST) ; then \
  91 -         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
  92 -         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
  93 -         echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules" ; \
  94 -         $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules ; \
  95 +         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
  96 +         $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
  97 +         echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules" ; \
  98 +         $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules ; \
  99         else \
 100           echo "***" ; \
 101           echo "*** Warning: gtk.immodules not built" ; \
 102 @@ -203,7 +203,7 @@
 103          fi
 104
 105  uninstall-local:
 106 -       rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules
 107 +       rm -f $(DESTDIR)$(sysconfdir)/gtk.immodules
 108
 109  if BUILD_DYNAMIC_MODULES
 110