SF.net SVN: gar:[23596] csw/mgar/pkg/gtk2/trunk

[guengel at users.sourceforge.net]

Revision: 23596
          http://sourceforge.net/p/gar/code/23596
Author:   guengel
Date:     2014-05-11 16:26:30 +0000 (Sun, 11 May 2014)
Log Message:
-----------
gtk2/trunk: Use the proper cache file for IM modules.

Modified Paths:
--------------
    csw/mgar/pkg/gtk2/trunk/Makefile
    csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall

Added Paths:
-----------
    csw/mgar/pkg/gtk2/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2014-05-11 15:51:47 UTC (rev 23595)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2014-05-11 16:26:30 UTC (rev 23596)
@@ -34,8 +34,6 @@
 
 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
 

Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall	2014-05-11 15:51:47 UTC (rev 23595)
+++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall	2014-05-11 16:26:30 UTC (rev 23596)
@@ -41,9 +41,9 @@
 echo "** Done Updating Icon cache"
 
 BIN=gtk-query-immodules-2.0
-BIN_OPTS="--update-modules"
+BIN_OPTS="--update-cache"
 
-echo "** Querying IM Modules"
+echo "** Querying IM Modules and update IM Cache"
 
 # Now, do all other
 for i in @NEEDED_ISAS@
@@ -60,16 +60,12 @@
             /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
 	    echo "Error"
 	else
-	    /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${gtk_immodules} f 0644 root bin
+	    /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} @prefix@/lib/${isa}/gtk-2.0/2.10.0/immodules.cache f 0644 root bin
 	    echo "OK"
 	fi
     fi
@@ -77,4 +73,4 @@
 
 /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
 
-echo "** Done querying IM Modules"
\ No newline at end of file
+echo "** Done querying IM Modules"

Added: csw/mgar/pkg/gtk2/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/changelog.CSW	2014-05-11 16:26:30 UTC (rev 23596)
@@ -0,0 +1,9 @@
+gtk2 (2.24.22,REV=2014.05.11)
+
+  * let gtk-query-immodules-2.0 write
+    /opt/csw/lib/gtk-2.0/2.10.0/immodules.cache in postinstall script
+    instead of /etc/opt/csw/gtk-2.0/gtk.immodules, which had no effect.
+
+ -- Rafael Ostertag <rafisol at opencsw.org>  Sun, 11 May 2014 18:25:18 +0200
+
+

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