[Midnightbsd-cvs] mports [24536] trunk/print: update harfbuzz to 1.9.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Oct 18 23:51:05 EDT 2018 

Revision: 24536
          http://svnweb.midnightbsd.org/mports/?rev=24536
Author:   laffer1
Date:     2018-10-18 23:51:05 -0400 (Thu, 18 Oct 2018)
Log Message:
-----------
update harfbuzz to 1.9.0

Modified Paths:
--------------
    trunk/print/Makefile
    trunk/print/harfbuzz/Makefile
    trunk/print/harfbuzz/distinfo
    trunk/print/harfbuzz/pkg-descr
    trunk/print/harfbuzz/pkg-plist

Added Paths:
-----------
    trunk/print/harfbuzz/files/patch-src_hb-atomic.hh
    trunk/print/harfbuzz-icu/
    trunk/print/harfbuzz-icu/Makefile
    trunk/print/harfbuzz-icu/pkg-plist

Removed Paths:
-------------
    trunk/print/harfbuzz/files/extra-src_hb-open-type-private.hh
    trunk/print/harfbuzz/files/patch-src_hb-atomic-private.hh

Modified: trunk/print/Makefile
===================================================================
--- trunk/print/Makefile	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/Makefile	2018-10-19 03:51:05 UTC (rev 24536)
@@ -34,6 +34,7 @@
 SUBDIR += gutenprint-base
 SUBDIR += gv
 SUBDIR += harfbuzz
+SUBDIR += harfbuzz-icu
 SUBDIR += hs-hscolour
 SUBDIR += indexinfo
 SUBDIR += libgnomecups

Modified: trunk/print/harfbuzz/Makefile
===================================================================
--- trunk/print/harfbuzz/Makefile	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/Makefile	2018-10-19 03:51:05 UTC (rev 24536)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	harfbuzz
-PORTVERSION=	1.3.2
+PORTVERSION=	1.9.0
+PORTREVISION?=	0
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
@@ -10,19 +11,33 @@
 
 LICENSE=	mit
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libicudata.so:${PORTSDIR}/devel/icu \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgraphite2.so:graphics/graphite2
 
 USE_LDCONFIG=	yes
-USES=		compiler:c++0x gmake libtool pathfix pkgconfig tar:bzip2
+USES=		compiler:c++11-lib gettext-runtime gmake gnome libtool \
+		pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 introspection:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
-PLIST_SUB+=	LIBVER=0.10302.0
+PLIST_SUB+=	LIBVER=0.10900.0
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-src_hb-open-type-private.hh
+HARFBUZZ_SLAVE?=	no
 
+.if ${HARFBUZZ_SLAVE} == no
+CONFIGURE_ARGS+=	--without-icu
+.else
+CONFIGURE_ARGS+=	--with-icu \
+		--disable-gtk-doc-html
+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz \
+		libicudata.so:devel/icu
+
+post-patch:
+	${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
+		${WRKSRC}/docs/Makefile.in
+.endif
+
 .include <bsd.port.mk>

Modified: trunk/print/harfbuzz/distinfo
===================================================================
--- trunk/print/harfbuzz/distinfo	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/distinfo	2018-10-19 03:51:05 UTC (rev 24536)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473409330
-SHA256 (harfbuzz-1.3.2.tar.bz2) = 8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027
-SIZE (harfbuzz-1.3.2.tar.bz2) = 1357986
+TIMESTAMP = 1536571987
+SHA256 (harfbuzz-1.9.0.tar.bz2) = 11eca62bf0ac549b8d6be55f4e130946399939cdfe7a562fdaee711190248b00
+SIZE (harfbuzz-1.9.0.tar.bz2) = 3870586

Deleted: trunk/print/harfbuzz/files/extra-src_hb-open-type-private.hh
===================================================================
--- trunk/print/harfbuzz/files/extra-src_hb-open-type-private.hh	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/files/extra-src_hb-open-type-private.hh	2018-10-19 03:51:05 UTC (rev 24536)
@@ -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 <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 */

Deleted: trunk/print/harfbuzz/files/patch-src_hb-atomic-private.hh
===================================================================
--- trunk/print/harfbuzz/files/patch-src_hb-atomic-private.hh	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/files/patch-src_hb-atomic-private.hh	2018-10-19 03:51:05 UTC (rev 24536)
@@ -1,16 +0,0 @@
---- src/hb-atomic-private.hh.orig	2015-04-10 02:16:57 UTC
-+++ src/hb-atomic-private.hh
-@@ -103,8 +103,12 @@ typedef int hb_atomic_int_impl_t;
- #define hb_atomic_int_impl_add(AI, V)		__sync_fetch_and_add (&(AI), (V))
- 
- #define hb_atomic_ptr_impl_get(P)		(void *) (__sync_synchronize (), *(P))
-+#if defined(__FreeBSD__) && defined(__mips__)
-+#include <machine/atomic.h>
-+#define hb_atomic_ptr_impl_cmpexch(P,O,N)	atomic_cmpset_rel_32 ((uint32_t *)(P), (uint32_t)(O), (uint32_t)(N))
-+#else
- #define hb_atomic_ptr_impl_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
--
-+#endif
- 
- #elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
- 

Added: trunk/print/harfbuzz/files/patch-src_hb-atomic.hh
===================================================================
--- trunk/print/harfbuzz/files/patch-src_hb-atomic.hh	                        (rev 0)
+++ trunk/print/harfbuzz/files/patch-src_hb-atomic.hh	2018-10-19 03:51:05 UTC (rev 24536)
@@ -0,0 +1,15 @@
+--- src/hb-atomic.hh.orig	2018-09-10 09:05:27 UTC
++++ src/hb-atomic.hh
+@@ -118,7 +118,12 @@ static_assert ((sizeof (LONG) == sizeof (int)), "");
+ 
+ #define hb_atomic_int_impl_add(AI, V)		__sync_fetch_and_add ((AI), (V))
+ 
++#if defined(__FreeBSD__) && defined(__mips__)
++#include <machine/atomic.h>
++#define hb_atomic_ptr_impl_cmpexch(P,O,N)	atomic_cmpset_rel_32 ((uint32_t *)(P), (uint32_t)(O), (uint32_t)(N))
++#else
+ #define hb_atomic_ptr_impl_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
++#endif
+ 
+ 
+ #elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)


Property changes on: trunk/print/harfbuzz/files/patch-src_hb-atomic.hh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/harfbuzz/pkg-descr
===================================================================
--- trunk/print/harfbuzz/pkg-descr	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/pkg-descr	2018-10-19 03:51:05 UTC (rev 24536)
@@ -1,3 +1,3 @@
 HarfBuzz is an OpenType text shaping engine.
 
-WWW: http://www.freedesktop.org/wiki/Software/HarfBuzz
+WWW: https://www.freedesktop.org/wiki/Software/HarfBuzz/

Modified: trunk/print/harfbuzz/pkg-plist
===================================================================
--- trunk/print/harfbuzz/pkg-plist	2018-10-19 03:45:48 UTC (rev 24535)
+++ trunk/print/harfbuzz/pkg-plist	2018-10-19 03:51:05 UTC (rev 24536)
@@ -1,5 +1,6 @@
 bin/hb-ot-shape-closure
 bin/hb-shape
+bin/hb-subset
 bin/hb-view
 include/harfbuzz/hb-blob.h
 include/harfbuzz/hb-buffer.h
@@ -13,33 +14,39 @@
 include/harfbuzz/hb-gobject-structs.h
 include/harfbuzz/hb-gobject.h
 include/harfbuzz/hb-graphite2.h
-include/harfbuzz/hb-icu.h
+include/harfbuzz/hb-map.h
 include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
+include/harfbuzz/hb-ot-math.h
 include/harfbuzz/hb-ot-shape.h
 include/harfbuzz/hb-ot-tag.h
+include/harfbuzz/hb-ot-var.h
 include/harfbuzz/hb-ot.h
 include/harfbuzz/hb-set.h
 include/harfbuzz/hb-shape-plan.h
 include/harfbuzz/hb-shape.h
+include/harfbuzz/hb-subset.h
 include/harfbuzz/hb-unicode.h
 include/harfbuzz/hb-version.h
 include/harfbuzz/hb.h
+lib/cmake/harfbuzz/harfbuzz-config.cmake
 lib/girepository-1.0/HarfBuzz-0.0.typelib
 lib/libharfbuzz-gobject.so
 lib/libharfbuzz-gobject.so.0
 lib/libharfbuzz-gobject.so.%%LIBVER%%
-lib/libharfbuzz-icu.so
-lib/libharfbuzz-icu.so.0
-lib/libharfbuzz-icu.so.%%LIBVER%%
+lib/libharfbuzz-subset.so
+lib/libharfbuzz-subset.so.0
+lib/libharfbuzz-subset.so.%%LIBVER%%
 lib/libharfbuzz.so
 lib/libharfbuzz.so.0
 lib/libharfbuzz.so.%%LIBVER%%
 libdata/pkgconfig/harfbuzz-gobject.pc
-libdata/pkgconfig/harfbuzz-icu.pc
+libdata/pkgconfig/harfbuzz-subset.pc
 libdata/pkgconfig/harfbuzz.pc
 share/gir-1.0/HarfBuzz-0.0.gir
 share/gtk-doc/html/harfbuzz/HarfBuzz.png
+share/gtk-doc/html/harfbuzz/HarfBuzz.svg
+share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html
 share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html
 share/gtk-doc/html/harfbuzz/annotation-glossary.html
 share/gtk-doc/html/harfbuzz/api-index-0-9-10.html
@@ -60,10 +67,17 @@
 share/gtk-doc/html/harfbuzz/api-index-1-0-5.html
 share/gtk-doc/html/harfbuzz/api-index-1-1-2.html
 share/gtk-doc/html/harfbuzz/api-index-1-1-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-2-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-3-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-4-2.html
+share/gtk-doc/html/harfbuzz/api-index-1-4-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-5-0.html
+share/gtk-doc/html/harfbuzz/api-index-1-6-0.html
 share/gtk-doc/html/harfbuzz/api-index-full.html
 share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
 share/gtk-doc/html/harfbuzz/building.html
-share/gtk-doc/html/harfbuzz/ch07.html
+share/gtk-doc/html/harfbuzz/ch08.html
+share/gtk-doc/html/harfbuzz/clusters.html
 share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html
 share/gtk-doc/html/harfbuzz/deprecated-api-index.html
 share/gtk-doc/html/harfbuzz/fonts-and-faces.html
@@ -82,6 +96,7 @@
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-math.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html
@@ -98,15 +113,18 @@
 share/gtk-doc/html/harfbuzz/install-harfbuzz.html
 share/gtk-doc/html/harfbuzz/left-insensitive.png
 share/gtk-doc/html/harfbuzz/left.png
+share/gtk-doc/html/harfbuzz/level-2.html
 share/gtk-doc/html/harfbuzz/object-tree.html
 share/gtk-doc/html/harfbuzz/plans-and-caching.html
 share/gtk-doc/html/harfbuzz/pt01.html
 share/gtk-doc/html/harfbuzz/pt02.html
+share/gtk-doc/html/harfbuzz/reordering-in-levels-0-and-1.html
 share/gtk-doc/html/harfbuzz/right-insensitive.png
 share/gtk-doc/html/harfbuzz/right.png
 share/gtk-doc/html/harfbuzz/setting-buffer-properties.html
 share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html
 share/gtk-doc/html/harfbuzz/style.css
+share/gtk-doc/html/harfbuzz/the-distinction-between-levels-0-and-1.html
 share/gtk-doc/html/harfbuzz/up-insensitive.png
 share/gtk-doc/html/harfbuzz/up.png
 share/gtk-doc/html/harfbuzz/using-harfbuzzs-native-opentype-implementation.html

Added: trunk/print/harfbuzz-icu/Makefile
===================================================================
--- trunk/print/harfbuzz-icu/Makefile	                        (rev 0)
+++ trunk/print/harfbuzz-icu/Makefile	2018-10-19 03:51:05 UTC (rev 24536)
@@ -0,0 +1,12 @@
+# $MidnightBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-icu
+
+COMMENT=	Harfbuzz ICU support
+
+MASTERDIR=	${.CURDIR}/../../print/harfbuzz
+PLIST=		${.CURDIR}/pkg-plist
+HARFBUZZ_SLAVE=	icu
+
+.include "${MASTERDIR}/Makefile"


Property changes on: trunk/print/harfbuzz-icu/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/harfbuzz-icu/pkg-plist
===================================================================
--- trunk/print/harfbuzz-icu/pkg-plist	                        (rev 0)
+++ trunk/print/harfbuzz-icu/pkg-plist	2018-10-19 03:51:05 UTC (rev 24536)
@@ -0,0 +1,54 @@
+ at comment bin/hb-ot-shape-closure
+ at comment bin/hb-shape
+ at comment bin/hb-subset
+ at comment bin/hb-view
+ at comment include/harfbuzz/hb-blob.h
+ at comment include/harfbuzz/hb-buffer.h
+ at comment include/harfbuzz/hb-common.h
+ at comment include/harfbuzz/hb-deprecated.h
+ at comment include/harfbuzz/hb-face.h
+ at comment include/harfbuzz/hb-font.h
+ at comment include/harfbuzz/hb-ft.h
+ at comment include/harfbuzz/hb-glib.h
+ at comment include/harfbuzz/hb-gobject-enums.h
+ at comment include/harfbuzz/hb-gobject-structs.h
+ at comment include/harfbuzz/hb-gobject.h
+ at comment include/harfbuzz/hb-graphite2.h
+ at comment include/harfbuzz/hb-map.h
+include/harfbuzz/hb-icu.h
+ at comment include/harfbuzz/hb-ot-font.h
+ at comment include/harfbuzz/hb-ot-layout.h
+ at comment include/harfbuzz/hb-ot-math.h
+ at comment include/harfbuzz/hb-ot-shape.h
+ at comment include/harfbuzz/hb-ot-tag.h
+ at comment include/harfbuzz/hb-ot-var.h
+ at comment include/harfbuzz/hb-ot.h
+ at comment include/harfbuzz/hb-set.h
+ at comment include/harfbuzz/hb-shape-plan.h
+ at comment include/harfbuzz/hb-shape.h
+ at comment include/harfbuzz/hb-subset-glyf.hh
+ at comment include/harfbuzz/hb-subset-plan.hh
+ at comment include/harfbuzz/hb-subset-private.hh
+ at comment include/harfbuzz/hb-subset.h
+ at comment include/harfbuzz/hb-unicode.h
+ at comment include/harfbuzz/hb-version.h
+ at comment include/harfbuzz/hb.h
+ at comment lib/cmake/harfbuzz/harfbuzz-config.cmake
+ at comment lib/girepository-1.0/HarfBuzz-0.0.typelib
+ at comment lib/libharfbuzz-gobject.so
+ at comment lib/libharfbuzz-gobject.so.0
+ at comment lib/libharfbuzz-gobject.so.%%LIBVER%%
+lib/libharfbuzz-icu.so
+lib/libharfbuzz-icu.so.0
+lib/libharfbuzz-icu.so.%%LIBVER%%
+ at comment lib/libharfbuzz-subset.so
+ at comment lib/libharfbuzz-subset.so.0
+ at comment lib/libharfbuzz-subset.so.%%LIBVER%%
+ at comment lib/libharfbuzz.so
+ at comment lib/libharfbuzz.so.0
+ at comment lib/libharfbuzz.so.%%LIBVER%%
+ at comment libdata/pkgconfig/harfbuzz-gobject.pc
+libdata/pkgconfig/harfbuzz-icu.pc
+ at comment libdata/pkgconfig/harfbuzz-subset.pc
+ at comment libdata/pkgconfig/harfbuzz.pc
+ at comment share/gir-1.0/HarfBuzz-0.0.gir


Property changes on: trunk/print/harfbuzz-icu/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list