SF.net SVN: gar:[22391] csw/mgar/pkg/gtk2/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Mon Nov 4 22:44:50 CET 2013
Revision: 22391
http://gar.svn.sourceforge.net/gar/?rev=22391&view=rev
Author: guengel
Date: 2013-11-04 21:44:49 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
gtk2/trunk: Updated OVERRIDES and DEPS.
Modified Paths:
--------------
csw/mgar/pkg/gtk2/trunk/Makefile
csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
Added Paths:
-----------
csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 20:19:40 UTC (rev 22390)
+++ csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 21:44:49 UTC (rev 22391)
@@ -1,4 +1,8 @@
# $Id$
+#
+# TODO: remove CHECKPKG_OVERRIDES_ += soname-unused as soon as issue
+# between sparc/i386 is sorted out. Also remove dependencies which had
+# to be added due to issue. --raos 2013-11-04
NAME = gtk2
VERSION = 2.24.22
@@ -30,6 +34,8 @@
PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch
+PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch
+
PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch
PATCHFILES += 0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch
@@ -60,6 +66,16 @@
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgdkpixbuf
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWhicoloricontheme
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWglib2
+# Remove after -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWgtk2 += soname-unused
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibfreetype6
PACKAGES += CSWgtk2-printbackends-papi
SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend
@@ -72,7 +88,30 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgcc-s1
# There is now libpapi.so in /usr/lib/64
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += 64-bit-binaries-missing
+# Remove after -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += soname-unused
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWpango
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWpango
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibgdk-x11-2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibgdk-pixbuf2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-papi += surplus-dependency|CSWlibgio2-0-0
+
PACKAGES += CSWgtk2-printbackends-file
SPKG_DESC_CSWgtk2-printbackends-file = $(DESCRIPTION), File Print Backend
PKGFILES_CSWgtk2-printbackends-file = .*/printbackends/libprintbackend-file.*
@@ -86,6 +125,24 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgcc-s1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWgtk2-printbackends-papi
+# Remove after -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += soname-unused
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWpango
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgdk-pixbuf2-0-0
PACKAGES += CSWgtk2-printbackends-cups
SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend
@@ -100,7 +157,34 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgcc-s1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWgtk2-printbackends-papi
+# Remove after -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += soname-unused
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgpg-error0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWpango
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgdk-pixbuf2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgnutls28
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgio2-0-0
+
PACKAGES += CSWgtk2-printbackends-lpr
SPKG_DESC_CSWgtk2-printbackends-lpr = $(DESCRIPTION), LPR Print Backend
PKGFILES_CSWgtk2-printbackends-lpr = .*/printbackends/libprintbackend-lpr.*
@@ -112,6 +196,28 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgcc-s1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWgtk2-printbackends-papi
+# Remove once -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += soname-unused
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWpango
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-x11-2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibatk1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-pixbuf2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgio2-0-0
PACKAGES += CSWlibgailutil18
SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil
@@ -124,6 +230,24 @@
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgcc-s1
+# Remove once -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += soname-unused
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibcairo2
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgdk-pixbuf2-0-0
PACKAGES += CSWlibgdk-x11-2-0-0
SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0
@@ -139,6 +263,10 @@
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibxrender
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgcc-s1
+# Remove once -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += soname-unused
+RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += surplus-dependency|CSWlibgmodule2-0-0
PACKAGES += CSWlibgtk-x11-2-0-0
SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0
@@ -156,11 +284,18 @@
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgcc-s1
+# remove after -z ignore issue has been resolved
+CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += soname-unused
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibxrender
PACKAGES += CSWlibgtk2-dev
SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files
PKGFILES_CSWlibgtk2-dev = $(PKGFILES_DEVEL)
PKGFILES_CSWlibgtk2-dev += .*/share/gtk-2.0/demo/.*
+PKGFILES_CSWlibgtk2-dev += .*/gtk-demo
# Use this to pick up files in lib/gtk-2.0/include
PKGFILES_CSWlibgtk2-dev += .*/include/.*\.h
PKGFILES_CSWlibgtk2-dev += .*/gtk-builder-convert
@@ -171,13 +306,19 @@
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf
# We wan't to make sure the CSWgtk2 postinstall is called
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgtk2
-RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev
-RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-dev
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk-dev
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo-dev
-RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpangodevel
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-dev
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpangodevel
OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel
CATALOGNAME_CSWgtk2devel = gtk2_devel_stub
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev
@@ -187,6 +328,8 @@
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWpangodevel
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgtk2
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf
+CHECKPKG_OVERRIDES_CSWlibgtk2-dev += soname-unused
+CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibintl8
PACKAGES += CSWgtk2doc
SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation
Copied: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch (from rev 22369, csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch)
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch 2013-11-04 21:44:49 UTC (rev 22391)
@@ -0,0 +1,109 @@
+From 12dfaa24cf6f26d7293d68e5b0ad3c1ce1504ea6 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 4 Nov 2013 08:43:08 +0100
+Subject: [PATCH] Add --update-modules cmd line option
+
+---
+ gtk/queryimmodules.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 51 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
+index a91ea47..69d89df 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"
+@@ -162,27 +165,71 @@ query_module (const char *dir, const char *name, GString *contents)
+ int main (int argc, char **argv)
+ {
+ char *cwd;
+- int i;
++ int i, fd, retval;
+ char *path;
++ char *gtk_immodules;
+ gboolean error = FALSE;
+ gchar *cache_file = NULL;
+ gint first_file = 1;
+ GString *contents;
+
++
++
+ if (argc > 1 && strcmp (argv[1], "--update-cache") == 0)
+ {
+ cache_file = gtk_rc_get_im_module_file ();
+ first_file = 2;
+ }
+
++ /*
++ * Quick an dirty hack.
++ *
++ * This will allow us to create the gtk.immodules in the default
++ * place by providing `--update-modules' as cmd line argument,
++ * without worrying where this might be when calling
++ * gtk-query-immodules-2.0 from a postinstall script.
++ *
++ * The basic idea is to redirect STDOUT to the default file and then
++ * let the normal flow of the program continue like there was no cmd
++ * line argument. Be aware, that this only works when no other cmd
++ * line options were passed.
++ */
++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
++ {
++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++ 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
++ */
++ first_file = 2;
++ }
++
++
+ contents = g_string_new ("");
+ g_string_append_printf (contents,
+ "# GTK+ Input Method Modules file\n"
+ "# Automatically generated file, do not edit\n"
+- "# Created by %s from gtk+-%d.%d.%d\n"
+- "#\n",
++ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n"
++ "#\n"
++ "#\n"
++ "# DefaultFile = %s\n"
++ "# DefaultDir = %s\n",
+ argv[0],
+- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL),
++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL));
+
+ if (argc == first_file) /* No file arguments given */
+ {
+--
+1.8.3.4
+
Property changes on: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/gtk2/branches/2.24-raos/files/0001-Add-update-modules-cmd-line-option.patch:16452-16569
Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04 20:19:40 UTC (rev 22390)
+++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04 21:44:49 UTC (rev 22391)
@@ -41,10 +41,11 @@
echo "** Done Updating Icon cache"
BIN=gtk-query-immodules-2.0
-BIN_OPTS="--update-cache"
+BIN_OPTS="--update-modules"
echo "** Querying IM Modules"
+# Now, do all other
for i in @NEEDED_ISAS@
do
# The default ISA is removed
@@ -59,6 +60,10 @@
/usr/bin/printf "- ${isa} ISA... "
fi
+ # Figure out the default file path (binary has to be patched for this)
+ gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print $4 }`"
+
+
/usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1
if [ $? -ne 0 ]
then
@@ -72,4 +77,4 @@
/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
-echo "** Done querying IM Modules"
+echo "** Done querying IM Modules"
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list