Annotation of /trunk/pango/patches/pango-1.32.1-multilib.patch
Parent Directory | Revision Log
Revision 1900 -
(hide annotations)
(download)
Thu Oct 4 09:27:13 2012 UTC (11 years, 11 months ago) by niro
File size: 1679 byte(s)
Thu Oct 4 09:27:13 2012 UTC (11 years, 11 months ago) by niro
File size: 1679 byte(s)
-re-diffed for 1.32.1
1 | niro | 1900 | diff -Naur pango-1.32.1/pango/Makefile.am pango-1.32.1-magellan/pango/Makefile.am |
2 | --- pango-1.32.1/pango/Makefile.am 2012-09-26 22:35:16.000000000 +0200 | ||
3 | +++ pango-1.32.1-magellan/pango/Makefile.am 2012-10-04 13:26:45.591983272 +0200 | ||
4 | @@ -18,6 +18,7 @@ | ||
5 | -DPANGO_ENABLE_ENGINE \ | ||
6 | -DSYSCONFDIR=\"$(sysconfdir)\" \ | ||
7 | -DLIBDIR=\"$(libdir)\" \ | ||
8 | + -DHOST=\"$(host_triplet)\" \ | ||
9 | -I$(top_srcdir) \ | ||
10 | -I$(top_builddir) \ | ||
11 | $(PANGO_DEBUG_FLAGS) \ | ||
12 | diff -Naur pango-1.32.1/pango/Makefile.in pango-1.32.1-magellan/pango/Makefile.in | ||
13 | --- pango-1.32.1/pango/Makefile.in 2012-09-28 02:15:54.000000000 +0200 | ||
14 | +++ pango-1.32.1-magellan/pango/Makefile.in 2012-10-04 13:27:14.531983125 +0200 | ||
15 | @@ -572,6 +572,7 @@ | ||
16 | -DPANGO_ENABLE_ENGINE \ | ||
17 | -DSYSCONFDIR=\"$(sysconfdir)\" \ | ||
18 | -DLIBDIR=\"$(libdir)\" \ | ||
19 | + -DHOST=\"$(host_triplet)\" \ | ||
20 | -I$(top_srcdir) \ | ||
21 | -I$(top_builddir) \ | ||
22 | $(PANGO_DEBUG_FLAGS) \ | ||
23 | diff -Naur pango-1.32.1/pango/modules.c pango-1.32.1-magellan/pango/modules.c | ||
24 | --- pango-1.32.1/pango/modules.c 2012-09-15 04:11:17.000000000 +0200 | ||
25 | +++ pango-1.32.1-magellan/pango/modules.c 2012-10-04 13:29:30.270983085 +0200 | ||
26 | @@ -549,6 +549,7 @@ | ||
27 | files = g_new (char *, 3); | ||
28 | |||
29 | files[0] = g_build_filename (pango_get_sysconf_subdirectory (), | ||
30 | + HOST, | ||
31 | "pango.modules", | ||
32 | NULL); | ||
33 | files[1] = g_build_filename (pango_get_lib_subdirectory (), | ||
34 | @@ -668,6 +669,7 @@ | ||
35 | if (!no_module_warning) | ||
36 | { | ||
37 | gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), | ||
38 | + HOST, | ||
39 | "pango.modules", | ||
40 | NULL); | ||
41 | g_critical ("No modules found:\n" |