diff options
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/harfbuzz/Makefile | 3 | ||||
| -rw-r--r-- | fonts/harfbuzz/distinfo | 3 | ||||
| -rw-r--r-- | fonts/harfbuzz/patches/patch-src_hb-common.cc | 37 |
3 files changed, 41 insertions, 2 deletions
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile index 987831330f9..72df327ad44 100644 --- a/fonts/harfbuzz/Makefile +++ b/fonts/harfbuzz/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/08/05 19:21:47 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/08/06 11:59:31 wiz Exp $ DISTNAME= harfbuzz-0.9.34 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo index f56cd6056bd..7e8d8da9111 100644 --- a/fonts/harfbuzz/distinfo +++ b/fonts/harfbuzz/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.28 2014/08/05 19:21:47 wiz Exp $ +$NetBSD: distinfo,v 1.29 2014/08/06 11:59:31 wiz Exp $ SHA1 (harfbuzz-0.9.34.tar.bz2) = 8a8cdbeaf1622459864180fbf453e3ab7343f338 RMD160 (harfbuzz-0.9.34.tar.bz2) = 3b493ca9757112882d1693d95c40afef57b021b6 Size (harfbuzz-0.9.34.tar.bz2) = 1157221 bytes +SHA1 (patch-src_hb-common.cc) = 8faaf0c667c514ee969c5b514b7c98e6a6f451c0 diff --git a/fonts/harfbuzz/patches/patch-src_hb-common.cc b/fonts/harfbuzz/patches/patch-src_hb-common.cc new file mode 100644 index 00000000000..eff5dc08261 --- /dev/null +++ b/fonts/harfbuzz/patches/patch-src_hb-common.cc @@ -0,0 +1,37 @@ +$NetBSD: patch-src_hb-common.cc,v 1.1 2014/08/06 11:59:32 wiz Exp $ + +Libraries should not call atexit(). +Remove wrong inline. + +--- src/hb-common.cc.orig 2014-07-30 21:55:33.000000000 +0000 ++++ src/hb-common.cc +@@ -234,8 +234,7 @@ struct hb_language_item_t { + + static hb_language_item_t *langs; + +-#ifdef HAVE_ATEXIT +-static inline ++static __attribute__((__destructor__)) + void free_langs (void) + { + while (langs) { +@@ -245,7 +244,6 @@ void free_langs (void) + langs = next; + } + } +-#endif + + static hb_language_item_t * + lang_find_or_insert (const char *key) +@@ -269,11 +267,6 @@ retry: + goto retry; + } + +-#ifdef HAVE_ATEXIT +- if (!first_lang) +- atexit (free_langs); /* First person registers atexit() callback. */ +-#endif +- + return lang; + } + |