76 lines
3.1 KiB
Diff
76 lines
3.1 KiB
Diff
Index: modules/Makefile.am
|
|
===================================================================
|
|
--- modules/Makefile.am.orig
|
|
+++ modules/Makefile.am
|
|
@@ -30,10 +30,10 @@ install-data-local: $(top_builddir)/pang
|
|
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
|
|
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
|
|
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
|
|
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
|
|
+ \> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
|
|
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
|
|
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
|
|
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
|
|
+ > $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
|
|
else \
|
|
echo "***" ; \
|
|
echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
|
|
Index: modules/pangorc
|
|
===================================================================
|
|
--- modules/pangorc.orig
|
|
+++ modules/pangorc
|
|
@@ -5,4 +5,4 @@
|
|
#
|
|
|
|
[Pango]
|
|
-ModuleFiles = ../modules/pango.modules
|
|
+ModuleFiles = ../modules/pango64.modules
|
|
Index: pango/modules.c
|
|
===================================================================
|
|
--- pango/modules.c.orig
|
|
+++ pango/modules.c
|
|
@@ -328,7 +328,7 @@ find_or_create_module (const char *raw_p
|
|
/* This is an entry put there by make install on the
|
|
* packager's system. On Windows a prebuilt Pango
|
|
* package can be installed in a random
|
|
- * location. The pango.modules file distributed in
|
|
+ * location. The pango64.modules file distributed in
|
|
* such a package contains paths from the package
|
|
* builder's machine. Replace the path with the real
|
|
* one on this machine. */
|
|
@@ -509,7 +509,7 @@ read_modules (void)
|
|
|
|
if (!file_str)
|
|
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
|
|
- "pango.modules",
|
|
+ "pango64.modules",
|
|
NULL);
|
|
|
|
files = pango_split_file_list (file_str);
|
|
@@ -620,7 +620,7 @@ build_map (PangoMapInfo *info)
|
|
if (!no_module_warning)
|
|
{
|
|
gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
|
|
- "pango.modules",
|
|
+ "pango64.modules",
|
|
NULL);
|
|
g_critical ("No modules found:\n"
|
|
"No builtin or dynamically loaded modules were found.\n"
|
|
Index: modules/Makefile.in
|
|
===================================================================
|
|
--- modules/Makefile.in.orig
|
|
+++ modules/Makefile.in
|
|
@@ -572,10 +572,10 @@ install-data-local: $(top_builddir)/pang
|
|
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
|
|
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
|
|
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
|
|
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
|
|
+ \> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
|
|
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
|
|
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
|
|
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
|
|
+ > $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
|
|
else \
|
|
echo "***" ; \
|
|
echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
|