diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-19 16:38:13 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-19 16:38:13 +0000 |
| commit | 3c9228c64fa39615a7aeac6c3d38310181d92f3c (patch) | |
| tree | fc02b558529fdcf3f747e08b3062477fc40edb53 /x11-libs/pango/files | |
| parent | New package. (diff) | |
| download | gentoo-2-3c9228c64fa39615a7aeac6c3d38310181d92f3c.tar.gz gentoo-2-3c9228c64fa39615a7aeac6c3d38310181d92f3c.tar.bz2 gentoo-2-3c9228c64fa39615a7aeac6c3d38310181d92f3c.zip | |
Version bump for gnome-3.6; now uses an external harfbuzz library and supports Unicode 6.1. The pangox library was split off into a separate package (pangox-compat). Keywords dropped due to harfbuzz dependency.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'x11-libs/pango/files')
| -rw-r--r-- | x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch new file mode 100644 index 000000000000..0820c78f128f --- /dev/null +++ b/x11-libs/pango/files/pango-1.32.1-lib64.patch @@ -0,0 +1,44 @@ +From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 28 Oct 2012 23:19:39 +0100 +Subject: [PATCH] Add multilib support + +pango.modules list modules specific to a host architecture. +Add host triplet in path so that machine able to run multiple +triplet have a proper file per pango library. +--- + pango/Makefile.am | 1 + + pango/pango-utils.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pango/Makefile.am b/pango/Makefile.am +index ab092c9..558108b 100644 +--- a/pango/Makefile.am ++++ b/pango/Makefile.am +@@ -17,6 +17,7 @@ INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DLIBDIR=\"$(libdir)\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +diff --git a/pango/pango-utils.c b/pango/pango-utils.c +index 18ffa26..3b88f15 100644 +--- a/pango/pango-utils.c ++++ b/pango/pango-utils.c +@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void) + #else + const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR"); + if (sysconfdir != NULL) +- tmp_result = g_build_filename (sysconfdir, "pango", NULL); ++ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL); + else +- tmp_result = SYSCONFDIR "/pango"; ++ tmp_result = SYSCONFDIR "/pango/" HOST; + #endif + g_once_init_leave((gsize*)&result, (gsize)tmp_result); + } +-- +1.7.12.4 + |