From 27c5615ce7649b657fcc7cd482b76157cee5817e Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 17 Feb 2017 16:54:34 +0000 Subject: There were a few others _FreeBSD_9 things around. Sponsored by: Absolight --- print/harfbuzz/Makefile | 3 --- .../files/extra-src_hb-open-type-private.hh | 25 ---------------------- 2 files changed, 28 deletions(-) delete mode 100644 print/harfbuzz/files/extra-src_hb-open-type-private.hh (limited to 'print/harfbuzz') diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile index d7c11af74e60..fb0fac1e09fa 100644 --- a/print/harfbuzz/Makefile +++ b/print/harfbuzz/Makefile @@ -23,7 +23,4 @@ TEST_TARGET= check PLIST_SUB+= LIBVER=0.10400.2 -EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} -EXTRA_PATCHES_FreeBSD_9= ${PATCHDIR}/extra-src_hb-open-type-private.hh - .include diff --git a/print/harfbuzz/files/extra-src_hb-open-type-private.hh b/print/harfbuzz/files/extra-src_hb-open-type-private.hh deleted file mode 100644 index 239c463c6355..000000000000 --- a/print/harfbuzz/files/extra-src_hb-open-type-private.hh +++ /dev/null @@ -1,25 +0,0 @@ -$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 -@@ -968,5 +973,8 @@ struct SortedArrayOf : ArrayOf { - - } /* namespace OT */ - -+#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)) -+#pragma GCC visibility pop -+#endif - - #endif /* HB_OPEN_TYPE_PRIVATE_HH */ -- cgit