diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-02-03 05:13:25 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-02-03 05:13:25 +0000 |
commit | d64d49019620b19dc3c746556f86d34b403908dd (patch) | |
tree | f3002f70af1da02843b8ddcdc3f5cc808cfbba76 /fonts | |
parent | 4158a62ef4771790fce3445cad31842d498f4437 (diff) | |
download | pkgsrc-d64d49019620b19dc3c746556f86d34b403908dd.tar.gz |
Fix build with gcc 4.2.1 of FreeBSD 9.1.
Patch is taken from
https://build.opensuse.org/package/view_file?file=mozilla-gcc43.patch&package=MozillaFirefox&project=home%3AWernerFink%3Abranches%3Amozilla .
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/harfbuzz/distinfo | 3 | ||||
-rw-r--r-- | fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo index 212a556cedb..27c1814cae1 100644 --- a/fonts/harfbuzz/distinfo +++ b/fonts/harfbuzz/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2013/01/21 13:54:11 wiz Exp $ +$NetBSD: distinfo,v 1.7 2013/02/03 05:13:25 ryoon Exp $ SHA1 (harfbuzz-0.9.12.tar.bz2) = 3f4f25a3b1c54bc415827bc79b36efef62220c5e RMD160 (harfbuzz-0.9.12.tar.bz2) = 7e408974aa9b4e0ba3cbc20a1973e1eaf495770d Size (harfbuzz-0.9.12.tar.bz2) = 886353 bytes +SHA1 (patch-src_hb-open-type-private.hh) = b8700b88b02c36d659af0ef151c477aa42043c6f SHA1 (patch-util_options.cc) = 4ee9ee39d1413ef4fad2023a0b62c4a8c00d91ad diff --git a/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh b/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh new file mode 100644 index 00000000000..239c463c635 --- /dev/null +++ b/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh @@ -0,0 +1,25 @@ +$NetBSD: patch-src_hb-open-type-private.hh,v 1.1 2013/02/03 05:13:26 ryoon Exp $ + +--- src/hb-open-type-private.hh.orig 2013-01-08 22:13:42.000000000 +0000 ++++ src/hb-open-type-private.hh +@@ -941,6 +941,11 @@ struct HeadlessArrayOf + DEFINE_SIZE_ARRAY (sizeof (USHORT), array); + }; + ++#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)) ++// work around GCC 4.3 bug where the search() function gets improperly ++// optimized away from some instantiations of this template ++#pragma GCC visibility push(default) ++#endif + + /* An array with sorted elements. Supports binary searching. */ + template <typename Type> +@@ -968,5 +973,8 @@ struct SortedArrayOf : ArrayOf<Type> { + + } /* namespace OT */ + ++#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)) ++#pragma GCC visibility pop ++#endif + + #endif /* HB_OPEN_TYPE_PRIVATE_HH */ |