# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1474588537 25200
# Node ID 9895f1ebff08e0010e7619a42f15cc6025c1d512
# Parent  8894a65803e182d153ecb5137161e0b0ed77f400
23501913 input-method-cache needs to create immodules.cache instead of gtk.immodules file (fix packaging)

diff -r 8894a65803e1 -r 9895f1ebff08 components/gnome/gtk2/Makefile
--- a/components/gnome/gtk2/Makefile	Fri Sep 23 18:00:08 2016 -0400
+++ b/components/gnome/gtk2/Makefile	Thu Sep 22 16:55:37 2016 -0700
@@ -61,6 +61,17 @@
 # Tell g-ir-scanner which compiler to use since upstream Makefile forgot to
 COMPONENT_BUILD_ENV += INTROSPECTION_SCANNER_ENV='CC=$(CC_FOR_BUILD)'
 
+# Generate and install architecture-specific configuration files.
+PROTOGTKDIR=		$(PROTO_DIR)$(USRLIB)/gtk-2.0/2.10.0
+PROTOIMMCONF=		$(PROTOGTKDIR)/immodules.cache
+
+COMPONENT_POST_INSTALL_ACTION += \
+	$(MKDIR) $(PROTOGTKDIR); \
+	LD_LIBRARY_PATH='$(PROTO_DIR)$(USRLIB)' \
+	  $(PROTO_DIR)$(USRBIN)/gtk-query-immodules-2.0 \
+	  $(PROTOGTKDIR)/immodules/*.so | \
+	  $(GSED) -e 's%$(PROTO_DIR)%%' > $(PROTOIMMCONF) ;
+
 # Needed for "gmake test" to work successfully.
 unexport SHELLOPTS
 
diff -r 8894a65803e1 -r 9895f1ebff08 components/gnome/gtk2/gtk2.p5m
--- a/components/gnome/gtk2/gtk2.p5m	Fri Sep 23 18:00:08 2016 -0400
+++ b/components/gnome/gtk2/gtk2.p5m	Thu Sep 22 16:55:37 2016 -0700
@@ -314,6 +314,7 @@
 file path=usr/lib/$(MACH64)/girepository-1.0/GdkX11-2.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/Gtk-2.0.typelib
 file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/engines/libpixmap.so
+file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules.cache preserve=true
 file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules/im-am-et.so
 file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules/im-cedilla.so
 file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
@@ -351,6 +352,7 @@
 file path=usr/lib/girepository-1.0/GdkX11-2.0.typelib
 file path=usr/lib/girepository-1.0/Gtk-2.0.typelib
 file path=usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
+file path=usr/lib/gtk-2.0/2.10.0/immodules.cache preserve=true
 file path=usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
 file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
 file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so