[csw-devel] SF.net SVN: gar:[16490] csw/mgar/pkg/gtk2/branches/2.24-raos/files

[guengel at users.sourceforge.net]

Revision: 16490
          http://gar.svn.sourceforge.net/gar/?rev=16490&view=rev
Author:   guengel
Date:     2011-12-13 22:25:36 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
gtk2/branches/2.24-raos: Patches for making gtk+ better play with 32/64bit libraries installed concurrently on the same system.

Added Paths:
-----------
    csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch
    csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch

Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch	                        (rev 0)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch	2011-12-13 22:25:36 UTC (rev 16490)
@@ -0,0 +1,76 @@
+From 780bf4b7fe81f5ecb94858e43fe07c4374a1f441 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Mon, 12 Dec 2011 22:00:33 +0100
+Subject: [PATCH] Add --update-modules cmd line option
+
+---
+ gtk/queryimmodules.c |   36 +++++++++++++++++++++++++++++++++++-
+ 1 files changed, 35 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
+index 5369c7f..21611e4 100644
+--- a/gtk/queryimmodules.c
++++ b/gtk/queryimmodules.c
+@@ -23,6 +23,7 @@
+ 
+ #include <glib.h>
+ #include <glib/gprintf.h>
++#include <glib/gstdio.h>
+ #include <gmodule.h>
+ 
+ #include <errno.h>
+@@ -30,6 +31,8 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <fcntl.h>
++#include <stdlib.h>
+ 
+ #ifdef USE_LA_MODULES
+ #define SOEXT ".la"
+@@ -164,10 +167,41 @@ query_module (const char *dir, const char *name)
+ int main (int argc, char **argv)
+ {
+   char *cwd;
+-  int i;
++  int i, fd, retval;
+   char *path;
++  char *gtk_immodules;
+   gboolean error = FALSE;
+ 
++  /*
++   * Quick an dirty hack
++   */
++  if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
++    {
++#if defined(__amd64) || defined(__sparcv9)
++      gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL);
++#else
++      gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++#endif
++      fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
++      if ( fd == -1 )
++	{
++	  g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules);
++	  exit(1);
++	}
++
++      if ( dup2(fd, STDOUT_FILENO) == -1 )
++	{
++	  g_fprintf(stderr, "Unable to redirect STDOUT.\n");
++	  exit(1);
++	}
++
++      /*
++       * cheat, to make it think there are no arguments given
++       */
++      argc = 1;
++    }
++      
++
+   g_printf ("# GTK+ Input Method Modules file\n"
+ 	    "# Automatically generated file, do not edit\n"
+ 	    "# Created by %s from gtk+-%d.%d.%d\n"
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch	                        (rev 0)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch	2011-12-13 22:25:36 UTC (rev 16490)
@@ -0,0 +1,35 @@
+From d7e51a17837834806952718835254927669e55e6 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Mon, 12 Dec 2011 20:10:28 +0100
+Subject: [PATCH] Use distinct files for gtk.immodules on 32/64bit libs
+
+---
+ gtk/gtkrc.c |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index 82a6470..38b0176 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -450,7 +450,18 @@ gtk_rc_get_im_module_file (void)
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
++	/*
++	 * Because we install 32/64 bit libraries concurrently, we
++	 * need to have a separate gtk.immodules files.
++	 *
++	 * - gtk.immodules is for 32bit libs
++	 * - gtk.immodules-64 is for 64bit libs
++	 */
++#if defined(__sparcv9) || defined(__amd64)
++	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL);
++#else
+ 	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++#endif
+     }
+ 
+   return result;
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.