callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Bug 703789 - gtk.immodules still referenced

Browse Source 
After switch to immodules.cache
This commit is contained in:
John Ralls
2013-07-28 13:59:55 -07:00
parent 43ed68aa33
commit 12fe6a9a1a
12 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.win32
View File

@ -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 &&

2
demos/gtk-demo/main.c
View File

@ -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 -- */

2
gtk+.spec.in
View File

@ -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)

2
gtk-zip.sh.in
View File

@ -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

6
gtk/Makefile.am
View File

@ -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) \

2
gtk/gtkimcontext.c
View File

@ -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.
*/

2
gtk/gtkimmodule.c
View File

@ -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.

16
modules/input/Makefile.am
View File

@ -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

2
tests/testcombochange.c
View File

@ -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);
}
}

2
tests/testdnd.c
View File

@ -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);
}
}

2
tests/testgtk.c
View File

@ -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);
}
}

7
tests/testtext.c
View File

@ -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