diff options
| -rw-r--r-- | fonts/harfbuzz/Makefile | 5 | ||||
| -rw-r--r-- | fonts/harfbuzz/PLIST | 53 | ||||
| -rw-r--r-- | fonts/harfbuzz/buildlink3.mk | 6 | ||||
| -rw-r--r-- | fonts/harfbuzz/distinfo | 11 | ||||
| -rw-r--r-- | fonts/harfbuzz/patches/patch-src_hb-blob.cc | 27 |
5 files changed, 30 insertions, 72 deletions
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile index d8ec018491a..48dcffbeb77 100644 --- a/fonts/harfbuzz/Makefile +++ b/fonts/harfbuzz/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.100 2018/10/30 10:33:36 abs Exp $ +# $NetBSD: Makefile,v 1.101 2018/11/12 03:49:09 ryoon Exp $ -DISTNAME= harfbuzz-1.8.8 -PKGREVISION= 1 +DISTNAME= harfbuzz-2.1.1 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST index 4fa1b7cc2e1..7f707d140c3 100644 --- a/fonts/harfbuzz/PLIST +++ b/fonts/harfbuzz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2018/06/17 08:24:41 wiz Exp $ +@comment $NetBSD: PLIST,v 1.28 2018/11/12 03:49:09 ryoon Exp $ bin/hb-ot-shape-closure bin/hb-shape bin/hb-subset @@ -13,19 +13,17 @@ ${PLIST.icu}include/harfbuzz/hb-ft.h include/harfbuzz/hb-glib.h ${PLIST.icu}include/harfbuzz/hb-icu.h include/harfbuzz/hb-map.h +include/harfbuzz/hb-ot-color.h include/harfbuzz/hb-ot-font.h include/harfbuzz/hb-ot-layout.h include/harfbuzz/hb-ot-math.h +include/harfbuzz/hb-ot-name.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-glyf.hh -include/harfbuzz/hb-subset-plan.hh -include/harfbuzz/hb-subset-private.hh include/harfbuzz/hb-subset.h include/harfbuzz/hb-unicode.h include/harfbuzz/hb-version.h @@ -39,8 +37,6 @@ lib/pkgconfig/harfbuzz-subset.pc lib/pkgconfig/harfbuzz.pc 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 share/gtk-doc/html/harfbuzz/api-index-0-9-11.html @@ -66,17 +62,21 @@ 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-1-7-5.html +share/gtk-doc/html/harfbuzz/api-index-1-7-7.html +share/gtk-doc/html/harfbuzz/api-index-1-8-0.html +share/gtk-doc/html/harfbuzz/api-index-1-8-1.html +share/gtk-doc/html/harfbuzz/api-index-1-8-5.html +share/gtk-doc/html/harfbuzz/api-index-1-8-6.html +share/gtk-doc/html/harfbuzz/api-index-1-9-0.html +share/gtk-doc/html/harfbuzz/api-index-2-0-0.html +share/gtk-doc/html/harfbuzz/api-index-2-1-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/ch08.html -share/gtk-doc/html/harfbuzz/clusters.html -share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html +share/gtk-doc/html/harfbuzz/ch01.html share/gtk-doc/html/harfbuzz/deprecated-api-index.html -share/gtk-doc/html/harfbuzz/fonts-and-faces.html -share/gtk-doc/html/harfbuzz/harfbuzz-Buffers.html -share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html +share/gtk-doc/html/harfbuzz/harfbuzz-.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html +share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html @@ -87,41 +87,28 @@ share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html +share/gtk-doc/html/harfbuzz/harfbuzz-hb-map.html +share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-color.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-name.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 +share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html +share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html -share/gtk-doc/html/harfbuzz/harfbuzz-hb.html share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 -share/gtk-doc/html/harfbuzz/hello-harfbuzz.html share/gtk-doc/html/harfbuzz/home.png share/gtk-doc/html/harfbuzz/index.html -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 -share/gtk-doc/html/harfbuzz/using-your-own-font-functions.html -share/gtk-doc/html/harfbuzz/what-about-the-other-scripts.html -share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html -share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html diff --git a/fonts/harfbuzz/buildlink3.mk b/fonts/harfbuzz/buildlink3.mk index 198ec6a539f..e95e241e7f1 100644 --- a/fonts/harfbuzz/buildlink3.mk +++ b/fonts/harfbuzz/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2017/02/12 06:27:04 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/11/12 03:49:09 ryoon Exp $ BUILDLINK_TREE+= harfbuzz .if !defined(HARFBUZZ_BUILDLINK3_MK) HARFBUZZ_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.4 -BUILDLINK_ABI_DEPENDS.harfbuzz+= harfbuzz>=1.4.2nb1 +BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.1.1 +BUILDLINK_ABI_DEPENDS.harfbuzz+= harfbuzz>=2.1.1 BUILDLINK_PKGSRCDIR.harfbuzz?= ../../fonts/harfbuzz .include "../../devel/glib2/buildlink3.mk" diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo index 8712823cfc0..ec31298af7a 100644 --- a/fonts/harfbuzz/distinfo +++ b/fonts/harfbuzz/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.78 2018/10/29 13:55:14 abs Exp $ +$NetBSD: distinfo,v 1.79 2018/11/12 03:49:09 ryoon Exp $ -SHA1 (harfbuzz-1.8.8.tar.bz2) = be496408b2bb3dc794891e8b0e977cd75f02d71d -RMD160 (harfbuzz-1.8.8.tar.bz2) = 3b4a94557770bc0aeb7a0a1d7fb3ac2c92830fc5 -SHA512 (harfbuzz-1.8.8.tar.bz2) = eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79 -Size (harfbuzz-1.8.8.tar.bz2) = 3862626 bytes -SHA1 (patch-src_hb-blob.cc) = 9f2858357d2a1fc8bf58c98b02041640557f6593 +SHA1 (harfbuzz-2.1.1.tar.bz2) = 14178b5d53083ea38b420ab860d49189d438393f +RMD160 (harfbuzz-2.1.1.tar.bz2) = 13937f4ff98d55169cb5a818cd045ed1b8b2789a +SHA512 (harfbuzz-2.1.1.tar.bz2) = c3fc46eaeb8c02594e2430f853b6eebb762072638e3113e27ff9b5caefce2c06534e8056d57f35d87df6dbb1027cbc0c1a08f914dec7c6a715c3f0abc0a18933 +Size (harfbuzz-2.1.1.tar.bz2) = 4386396 bytes diff --git a/fonts/harfbuzz/patches/patch-src_hb-blob.cc b/fonts/harfbuzz/patches/patch-src_hb-blob.cc deleted file mode 100644 index 6f102224f81..00000000000 --- a/fonts/harfbuzz/patches/patch-src_hb-blob.cc +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-src_hb-blob.cc,v 1.1 2018/10/29 13:55:14 abs Exp $ - -Quoting the URL given in the source: - - The POSIX standard states that a strictly conforming application - "for the C programming language, shall define _POSIX_C_SOURCE to - be 200112L before any header is included." - -Asserting this for only one file out of an application is not defined, -and the standards also explicitly do not apply to c++. - -Its quite possible that some operating systems need _POSIX_C_SOURCE -set to build this file, but its not a general solution, and lets -not do it on NetBSD where is interacts badly with at least gcc-6.4 -7.3 and 8.2 on NetBSD-8/amd64 - ---- src/hb-blob.cc.orig 2018-06-05 22:13:36.000000000 +0000 -+++ src/hb-blob.cc -@@ -26,7 +26,7 @@ - */ - - /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ --#ifndef _POSIX_C_SOURCE -+#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__) - #define _POSIX_C_SOURCE 200809L - #endif - |