[102562] trunk/dports/x11/pango
ryandesign at macports.org
ryandesign at macports.org
Mon Feb 4 13:32:25 PST 2013
Revision: 102562
https://trac.macports.org/changeset/102562
Author: ryandesign at macports.org
Date: 2013-02-04 13:32:25 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
pango: update to 1.32.5
Modified Paths:
--------------
trunk/dports/x11/pango/Portfile
Removed Paths:
-------------
trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2013-02-04 21:29:05 UTC (rev 102561)
+++ trunk/dports/x11/pango/Portfile 2013-02-04 21:32:25 UTC (rev 102562)
@@ -6,8 +6,7 @@
name pango
conflicts pango-devel
epoch 1
-version 1.30.1
-revision 3
+version 1.32.5
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
maintainers ryandesign openmaintainer
@@ -26,8 +25,8 @@
open-source framework for the layout and rendering \
of internationalized text.
-checksums rmd160 a0c68de9e02dbdb690ada02e945a378c6ca4a71b \
- sha256 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe
+checksums rmd160 809f009543426ec5153394e261fdb2faf16d259b \
+ sha256 7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821
depends_build \
port:pkgconfig
@@ -36,10 +35,11 @@
path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/cairo.pc:cairo \
port:gobject-introspection \
+ port:graphite2 \
+ port:harfbuzz \
port:libpng
patchfiles patch-ltmain.sh.diff
-patchfiles-append patch-pango-pangocoretext-fontmap.c.diff
configure.ccache no
@@ -53,7 +53,14 @@
}
pre-configure {
- set glib_minimum_version 2.31.0
+ set harfbuzz_minimum_version 0.9.9
+ set harfbuzz_installed_version [exec ${prefix}/bin/pkg-config harfbuzz --modversion]
+ if {[vercmp ${harfbuzz_installed_version} ${harfbuzz_minimum_version}] < 0} {
+ ui_error "${name} ${version} requires harfbuzz ${harfbuzz_minimum_version} or later but you have harfbuzz ${harfbuzz_installed_version}."
+ return -code error "incompatible harfbuzz version"
+ }
+
+ set glib_minimum_version 2.33.12
set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
if {[vercmp ${glib_installed_version} ${glib_minimum_version}] < 0} {
ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
@@ -101,6 +108,7 @@
# gobject-introspection uses g-ir-scanner, which uses $CC from env
build.args-append CC="${configure.cc} ${configure.cc_archflags}"
+destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
configure.args-append --with-included-modules
@@ -121,9 +129,7 @@
}
post-destroot {
- if {![variant_isset x11]} {
- xinstall -d ${destroot}${prefix}/etc/pango
- }
+ xinstall -d ${destroot}${prefix}/etc/pango
if {![variant_isset builtin_modules]} {
xinstall -m 0644 ${worksrcpath}/modules/pangorc \
${destroot}${prefix}/etc/pango
@@ -131,7 +137,7 @@
${destroot}${prefix}/etc/pango/pangorc
system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
- ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \
+ ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/*/modules/*.so \
>${destroot}${prefix}/etc/pango/pango.modules"
reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
}
Deleted: trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff 2013-02-04 21:29:05 UTC (rev 102561)
+++ trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff 2013-02-04 21:32:25 UTC (rev 102562)
@@ -1,60 +0,0 @@
-coretext: don't insert item in the hash if it originated from the hash
-https://github.com/GNOME/pango/commit/70a85d441d973883af4afb57599bc570eeea4c83
---- pango/pangocoretext-fontmap.c.orig
-+++ pango/pangocoretext-fontmap.c
-@@ -1284,13 +1284,11 @@ struct _PangoCoreTextFontKey
-
- if (G_UNLIKELY (!fontset))
- {
-+ gboolean insert_in_hash = TRUE;
-+
- fontset = pango_core_text_fontset_new (&key, desc);
-
-- if (G_LIKELY (fontset))
-- g_hash_table_insert (ctfontmap->fontset_hash,
-- pango_core_text_fontset_get_key (fontset),
-- fontset);
-- else
-+ if (G_UNLIKELY (!fontset))
- {
- /* If no font(set) could be loaded, we fallback to "Sans",
- * which should always work on Mac. We try to adhere to the
-@@ -1308,7 +1306,9 @@ struct _PangoCoreTextFontKey
- language);
-
- fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
-- if (G_UNLIKELY (!fontset))
-+ if (G_LIKELY (fontset))
-+ insert_in_hash = FALSE;
-+ else
- fontset = pango_core_text_fontset_new (&key, tmp_desc);
-
- if (G_UNLIKELY (!fontset))
-@@ -1335,7 +1335,9 @@ struct _PangoCoreTextFontKey
- }
-
- fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
-- if (G_UNLIKELY (!fontset))
-+ if (G_LIKELY (fontset))
-+ insert_in_hash = FALSE;
-+ else
- fontset = pango_core_text_fontset_new (&key, tmp_desc);
-
- if (G_UNLIKELY (!fontset))
-@@ -1346,11 +1348,12 @@ struct _PangoCoreTextFontKey
- g_error ("Could not load fallback font, bailing out.");
- }
- }
--
-- g_hash_table_insert (ctfontmap->fontset_hash,
-- pango_core_text_fontset_get_key (fontset),
-- fontset);
- }
-+
-+ if (insert_in_hash)
-+ g_hash_table_insert (ctfontmap->fontset_hash,
-+ pango_core_text_fontset_get_key (fontset),
-+ fontset);
- }
-
- /* Cannot use pango_core_text_fontset_key_free() here */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130204/7dadd369/attachment.html>
More information about the macports-changes
mailing list