[gtk+/gtk-2-24] Bug Bug 703789 - gtk.immodules still referenced
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] Bug Bug 703789 - gtk.immodules still referenced
- Date: Sun, 28 Jul 2013 21:05:29 +0000 (UTC)
commit 12fe6a9a1ad65a46de63d619925bd1e5e7f1f9b4
Author: John Ralls <jralls ceridwen us>
Date: Sun Jul 28 13:59:55 2013 -0700
Bug Bug 703789 - gtk.immodules still referenced
After switch to immodules.cache
README.win32 | 4 ++--
demos/gtk-demo/main.c | 2 +-
gtk+.spec.in | 2 +-
gtk-zip.sh.in | 2 +-
gtk/Makefile.am | 6 +++---
gtk/gtkimcontext.c | 2 +-
gtk/gtkimmodule.c | 2 +-
modules/input/Makefile.am | 16 ++++++++--------
tests/testcombochange.c | 2 +-
tests/testdnd.c | 2 +-
tests/testgtk.c | 2 +-
tests/testtext.c | 7 +------
12 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/README.win32 b/README.win32
index 7a8e852..36f350c 100644
--- a/README.win32
+++ b/README.win32
@@ -112,8 +112,8 @@ PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX
grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders
$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules
$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
- mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/lib/gtk-2.0/2.10.0/immodules.cache
$TARGET/lib/gtk-2.0/2.10.0/immodules.temp &&
+ mv $TARGET/lib/gtk-2.0/2.10.0/immodules.temp $TARGET/lib/gtk-2.0/2.10.0/immodules.cache &&
./gtk-zip.sh &&
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index c7492ef..fd26d2d 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -942,7 +942,7 @@ main (int argc, char **argv)
G_FILE_TEST_EXISTS))
{
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
+ g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
}
/* -- End of hack -- */
diff --git a/gtk+.spec.in b/gtk+.spec.in
index 7e7267c..a45371c 100644
--- a/gtk+.spec.in
+++ b/gtk+.spec.in
@@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgdk*.so.*
%{_libdir}/gtk-2.0/%{binary_version}/*/*.so
#%{_datadir}/locale/*/*/*
-%{_sysconfdir}/gtk-2.0/gtk.immodules
+%{_libdir}/gtk-2.0/%{binary_version}/immodules.cache
%files devel
%defattr(-, root, root)
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 0cc2f62..295fde5 100755
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -15,7 +15,7 @@ cp -p @abs_srcdir@/COPYING share/doc/gtk+-dev- GTK_VERSION@
rm $ZIP
zip $ZIP -@ <<EOF
etc/gtk-2.0/gtkrc
-etc/gtk-2.0/gtk.immodules
+lib/gtk-2.0/@GTK_BINARY_VERSION/immodules.cache
etc/gtk-2.0/im-multipress.conf
bin/libgdk-win32- GTK_API_VERSION@- LT_CURRENT_MINUS_AGE@.dll
bin/libgtk-win32- GTK_API_VERSION@- LT_CURRENT_MINUS_AGE@.dll
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9aeada7..7fbe429 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -953,7 +953,7 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
done >libgtk.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
rm libgtk.sourcefiles
-
+
../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
case $$F in \
@@ -963,7 +963,7 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
done >libgtk.vs10.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
rm libgtk.vs10.sourcefiles
-
+
../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
case $$F in \
@@ -997,7 +997,7 @@ distclean-local:
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
-TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \
$(gtktargetlib) \
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 7905214..d1ab44f 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -95,7 +95,7 @@
* as specified in the #GtkIMContextInfo array returned by im_module_list().
*
* After a new loadable input method module has been installed on the system,
- * the configuration file <filename>gtk.immodules</filename> needs to be
+ * the configuration file <filename>immodules.cache</filename> needs to be
* regenerated by <link linkend="gtk-query-immodules-2.0">gtk-query-immodules-2.0</link>,
* in order for the new input method to become available to GTK+ applications.
*/
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index d29162d..1fcb17a 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -250,7 +250,7 @@ correct_libdir_prefix (gchar **path)
/* This is an entry put there by make install on the
* packager's system. On Windows a prebuilt GTK+
* package can be installed in a random
- * location. The gtk.immodules file distributed in
+ * location. The immodules.cache file distributed in
* such a package contains paths from the package
* builder's machine. Replace the path with the real
* one on this machine.
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index c5e249a..deacff7 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -202,11 +202,11 @@ install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules"
; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ echo "$(DESTDOR)$(bindir)/gtk-query-immodules-2.0 >
$(DESTDIR)$(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules.cache" ; \
+ $(DESTDIR)/$(bindir)/gtk-query-immodules-2.0 >
$(DESTDIR)$(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules.cache ; \
else \
echo "***" ; \
- echo "*** Warning: gtk.immodules not built" ; \
+ echo "*** Warning: immodules.cache not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
echo "*** system using gtk-query-immodules-2.0" ; \
@@ -214,7 +214,7 @@ install-data-hook:
fi
uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(libdir)/gtk-2.0/2.10.0/immodules.cache
if BUILD_DYNAMIC_MODULES
@@ -252,14 +252,14 @@ noinst_LTLIBRARIES = \
included-modules: $(noinst_LTLIBRARIES)
-gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+immodules.cache: Makefile.am $(module_LTLIBRARIES)
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > immodules.cache
-CLEANFILES = gtk.immodules
+CLEANFILES = immodules.cache
if CROSS_COMPILING
else
-all-local: gtk.immodules
+all-local: immodules.cache
endif
-include $(top_srcdir)/git.mk
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index 89fe3a1..559320a 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -35,7 +35,7 @@ test_init (void)
G_FILE_TEST_EXISTS))
{
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+ g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
}
}
diff --git a/tests/testdnd.c b/tests/testdnd.c
index 0e59364..bd59261 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -577,7 +577,7 @@ test_init (void)
G_FILE_TEST_EXISTS))
{
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+ g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
}
}
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 156b90c..ec2c57c 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -13504,7 +13504,7 @@ test_init (void)
G_FILE_TEST_EXISTS))
{
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+ g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
}
}
diff --git a/tests/testtext.c b/tests/testtext.c
index 1e0161d..880eaa7 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -3031,12 +3031,7 @@ view_add_example_widgets (View *view)
void
test_init (void)
{
- if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
- G_FILE_TEST_EXISTS))
- {
- g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
- }
+ g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
}
int
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]