Fri Nov 6 15:06:50 2020 UTC ()
Split out ICU integration library from the harfbuzz package.
Only a few pieces of software are using the ICU integration library,
these aren't the big harfbuzz users (i.e. gtk). this is intended to lessen
the impact of icu's frequent ABI breaks.
(nia)
diff -r1.343 -r1.344 pkgsrc/fonts/Makefile
diff -r1.136 -r1.137 pkgsrc/fonts/harfbuzz/Makefile
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz/Makefile.common
diff -r1.44 -r1.45 pkgsrc/fonts/harfbuzz/PLIST
diff -r1.9 -r1.10 pkgsrc/fonts/harfbuzz/options.mk
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/DESCR
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/Makefile
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/PLIST
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/buildlink3.mk
diff -r1.245 -r1.246 pkgsrc/misc/libreoffice/Makefile
diff -r1.196 -r1.197 pkgsrc/www/webkit-gtk/Makefile
--- pkgsrc/fonts/Makefile 2020/08/06 11:08:20 1.343
+++ pkgsrc/fonts/Makefile 2020/11/06 15:06:49 1.344
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.343 2020/08/06 11:08:20 pin Exp $
+# $NetBSD: Makefile,v 1.344 2020/11/06 15:06:49 nia Exp $
#
COMMENT= Fonts
@@ -119,6 +119,7 @@
SUBDIR+= gsftopkk
SUBDIR+= gucharmap
SUBDIR+= harfbuzz
+SUBDIR+= harfbuzz-icu
SUBDIR+= ibm-plex-otf
SUBDIR+= ibm-plex-ttf
SUBDIR+= inconsolata-g
--- pkgsrc/fonts/harfbuzz/Makefile 2020/11/05 09:08:06 1.136
+++ pkgsrc/fonts/harfbuzz/Makefile 2020/11/06 15:06:49 1.137
@@ -1,83 +1,12 @@
-# $NetBSD: Makefile,v 1.136 2020/11/05 09:08:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.137 2020/11/06 15:06:49 nia Exp $
-DISTNAME= harfbuzz-2.7.2
PKGREVISION= 1
-CATEGORIES= fonts
-MASTER_SITES= ${MASTER_SITE_GITHUB:=harfbuzz/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://harfbuzz.github.io/
+.include "Makefile.common"
+
COMMENT= OpenType text shaping engine
-LICENSE= mit
-# C++11
-GCC_REQD+= 4.9
+# Use external icu support.
+MESON_ARGS+= -Dicu=disabled
-.include "../../mk/bsd.prefs.mk"
-.include "../../graphics/librsvg/available.mk"
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-
-# cairo/fontconfig are only needed for command line utilities
-MESON_ARGS+= -Dcairo=disabled
-MESON_ARGS+= -Dfontconfig=disabled
-
-MESON_ARGS+= -Dintrospection=disabled
-MESON_ARGS+= -Dbenchmark=disabled
-
-PLIST_VARS+= graphite2
-.if ${LIBRSVG_TYPE} == "rust"
-MESON_ARGS+= -Dgraphite=enabled
-PLIST.graphite2= yes
-.else
-MESON_ARGS+= -Dgraphite=disabled
-.endif
-
-PKGCONFIG_OVERRIDE+= output/meson-private/*.pc
-
-PKGCONFIG_OVERRIDE_STAGE= pre-install
-
-LDFLAGS.OpenBSD+= -lz
-
-.include "options.mk"
-
-# gcc too old
-BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden
-
-PLIST_VARS+= coretext
-
-.if ${OPSYS} == "Darwin"
-. if !empty(OS_VERSION:M[0-8].*)
-# MacOS X < 10.5 does not have CoreText.
-MESON_ARGS+= -Dcoretext=disabled
-
-. elif !empty(OS_VERSION:M9.*)
-# MacOS X 10.5 has CoreText but it's
-# buggy. CTLineCreateWithAttributedString() seemingly fails when
-# trying to use a font which isn't installed into the system standard
-# path.
-# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5
-MESON_ARGS+= -Dcoretext=disabled
-
-. else
-MESON_ARGS+= -Dcoretext=enabled
-PLIST.coretext= yes
-. endif
-.endif
-
-PYTHON_FOR_BUILD_ONLY= tool
-REPLACE_PYTHON+= src/*.py
-
-.include "../../devel/meson/build.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
-#.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.if ${LIBRSVG_TYPE} == "rust"
-# graphite2 support breaks graphics/librsvg-c
-.include "../../graphics/graphite2/buildlink3.mk"
-.endif
.include "../../mk/bsd.pkg.mk"
# $NetBSD: Makefile.common,v 1.1 2020/11/06 15:06:49 nia Exp $
# used by fonts/harfbuzz-icu/Makefile
DISTNAME= harfbuzz-2.7.2
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GITHUB:=harfbuzz/}
GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://harfbuzz.github.io/
LICENSE= mit
WRKSRC= ${WRKDIR}/${DISTNAME}
DISTINFO_FILE= ${.CURDIR}/../../fonts/harfbuzz/distinfo
#PATCHDIR= ${.CURDIR}/../../fonts/harfbuzz/patches
# C++11
GCC_REQD+= 4.9
.include "../../mk/bsd.prefs.mk"
.include "../../graphics/librsvg/available.mk"
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
# cairo/fontconfig are only needed for command line utilities
MESON_ARGS+= -Dcairo=disabled
MESON_ARGS+= -Dfontconfig=disabled
MESON_ARGS+= -Dintrospection=disabled
MESON_ARGS+= -Dbenchmark=disabled
PLIST_VARS+= graphite2
.if ${LIBRSVG_TYPE} == "rust"
MESON_ARGS+= -Dgraphite=enabled
PLIST.graphite2= yes
.else
MESON_ARGS+= -Dgraphite=disabled
.endif
PKGCONFIG_OVERRIDE+= output/meson-private/*.pc
PKGCONFIG_OVERRIDE_STAGE= pre-install
LDFLAGS.OpenBSD+= -lz
.include "../../fonts/harfbuzz/options.mk"
# gcc too old
BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden
PLIST_VARS+= coretext
.if ${OPSYS} == "Darwin"
. if !empty(OS_VERSION:M[0-8].*)
# MacOS X < 10.5 does not have CoreText.
MESON_ARGS+= -Dcoretext=disabled
. elif !empty(OS_VERSION:M9.*)
# MacOS X 10.5 has CoreText but it's
# buggy. CTLineCreateWithAttributedString() seemingly fails when
# trying to use a font which isn't installed into the system standard
# path.
# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5
MESON_ARGS+= -Dcoretext=disabled
. else
MESON_ARGS+= -Dcoretext=enabled
PLIST.coretext= yes
. endif
.endif
PYTHON_FOR_BUILD_ONLY= tool
REPLACE_PYTHON+= src/*.py
.include "../../devel/meson/build.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
#.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.if ${LIBRSVG_TYPE} == "rust"
# graphite2 support breaks graphics/librsvg-c
.include "../../graphics/graphite2/buildlink3.mk"
.endif
--- pkgsrc/fonts/harfbuzz/PLIST 2020/09/04 10:50:08 1.44
+++ pkgsrc/fonts/harfbuzz/PLIST 2020/11/06 15:06:49 1.45
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2020/09/04 10:50:08 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.45 2020/11/06 15:06:49 nia Exp $
bin/hb-ot-shape-closure
bin/hb-shape
bin/hb-subset
@@ -18,7 +18,6 @@
include/harfbuzz/hb-gobject-structs.h
include/harfbuzz/hb-gobject.h
${PLIST.graphite2}include/harfbuzz/hb-graphite2.h
-${PLIST.icu}include/harfbuzz/hb-icu.h
include/harfbuzz/hb-map.h
include/harfbuzz/hb-ot-color.h
include/harfbuzz/hb-ot-deprecated.h
@@ -44,9 +43,6 @@
lib/libharfbuzz-gobject.so
lib/libharfbuzz-gobject.so.0
lib/libharfbuzz-gobject.so.0.20702.0
-${PLIST.icu}lib/libharfbuzz-icu.so
-${PLIST.icu}lib/libharfbuzz-icu.so.0
-${PLIST.icu}lib/libharfbuzz-icu.so.0.20702.0
lib/libharfbuzz-subset.so
lib/libharfbuzz-subset.so.0
lib/libharfbuzz-subset.so.0.20702.0
@@ -54,7 +50,6 @@
lib/libharfbuzz.so.0
lib/libharfbuzz.so.0.20702.0
lib/pkgconfig/harfbuzz-gobject.pc
-${PLIST.icu}lib/pkgconfig/harfbuzz-icu.pc
lib/pkgconfig/harfbuzz-subset.pc
lib/pkgconfig/harfbuzz.pc
${PLIST.introspection}share/gir-1.0/HarfBuzz-0.0.gir
--- pkgsrc/fonts/harfbuzz/options.mk 2020/09/04 10:50:08 1.9
+++ pkgsrc/fonts/harfbuzz/options.mk 2020/11/06 15:06:49 1.10
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2020/09/04 10:50:08 prlw1 Exp $
+# $NetBSD: options.mk,v 1.10 2020/11/06 15:06:49 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.harfbuzz
-PKG_SUPPORTED_OPTIONS+= doc icu introspection
-PKG_SUGGESTED_OPTIONS= doc icu introspection
+PKG_SUPPORTED_OPTIONS+= doc introspection
+PKG_SUGGESTED_OPTIONS= doc introspection
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= doc icu introspection
+PLIST_VARS+= doc introspection
.if !empty(PKG_OPTIONS:Mdoc)
MESON_ARGS+= -Ddocs=enabled
@@ -14,14 +14,6 @@
PLIST.doc= yes
.else
MESON_ARGS+= -Ddocs=disabled
-.endif
-
-.if !empty(PKG_OPTIONS:Micu)
-.include "../../textproc/icu/buildlink3.mk"
-MESON_ARGS+= -Dicu=enabled
-PLIST.icu= yes
-.else
-MESON_ARGS+= -Dicu=disabled
.endif
.if !empty(PKG_OPTIONS:Mintrospection)
International Components for Unicode integration for HarfBuzz
# $NetBSD: Makefile,v 1.1 2020/11/06 15:06:49 nia Exp $
# XXX: hack to override meson installation
INSTALL_DIRS=
.include "../../fonts/harfbuzz/Makefile.common"
PKGNAME= ${DISTNAME:S/^harfbuzz-/harfbuzz-icu-/1}
COMMENT= OpenType text shaping engine (ICU integration)
MESON_ARGS+= -Dicu=enabled
INSTALLATION_DIRS+= include/harfbuzz
INSTALLATION_DIRS+= lib
INSTALLATION_DIRS+= lib/pkgconfig
HARFBUZZ_ICU_LIBNAME= libharfbuzz-icu.so.0.20702.0
.PHONY: harfbuzz-icu-install
harfbuzz-icu-install:
${INSTALL_DATA} ${WRKSRC}/src/hb-icu.h \
${DESTDIR}${PREFIX}/include/harfbuzz/hb-icu.h
${INSTALL_DATA} ${WRKSRC}/output/meson-private/harfbuzz-icu.pc \
${DESTDIR}${PREFIX}/lib/pkgconfig/harfbuzz-icu.pc
${INSTALL_LIB} ${WRKSRC}/output/src/${HARFBUZZ_ICU_LIBNAME} \
${DESTDIR}${PREFIX}/lib
cd ${DESTDIR}${PREFIX}/lib && ${LN} -s ${HARFBUZZ_ICU_LIBNAME} libharfbuzz-icu.so.0
cd ${DESTDIR}${PREFIX}/lib && ${LN} -s ${HARFBUZZ_ICU_LIBNAME} libharfbuzz-icu.so
do-install: harfbuzz-icu-install
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@comment $NetBSD: PLIST,v 1.1 2020/11/06 15:06:49 nia Exp $
include/harfbuzz/hb-icu.h
lib/libharfbuzz-icu.so
lib/libharfbuzz-icu.so.0
lib/libharfbuzz-icu.so.0.20702.0
lib/pkgconfig/harfbuzz-icu.pc
# $NetBSD: buildlink3.mk,v 1.1 2020/11/06 15:06:49 nia Exp $
BUILDLINK_TREE+= harfbuzz-icu
.if !defined(HARFBUZZ_ICU_BUILDLINK3_MK)
HARFBUZZ_ICU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.harfbuzz-icu+= harfbuzz-icu>=2.1.1
BUILDLINK_ABI_DEPENDS.harfbuzz-icu+= harfbuzz-icu>=2.6.4nb2
.include "../../fonts/harfbuzz/buildlink3.mk"
.endif # HARFBUZZ_ICU_BUILDLINK3_MK
BUILDLINK_TREE+= -harfbuzz-icu
--- pkgsrc/misc/libreoffice/Makefile 2020/11/05 09:08:42 1.245
+++ pkgsrc/misc/libreoffice/Makefile 2020/11/06 15:06:49 1.246
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.245 2020/11/05 09:08:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.246 2020/11/06 15:06:49 nia Exp $
VERREL= 7.0.3
VERRC= 1
VER= ${VERREL}.${VERRC}
DISTNAME= libreoffice-${VER}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
EXTRACT_SUFX= .tar.xz
@@ -350,6 +350,7 @@
.if ${LIBRSVG_TYPE} == "rust"
#BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=1.4.2
.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../fonts/harfbuzz-icu/buildlink3.mk"
.include "../../graphics/graphite2/buildlink3.mk"
.endif
# Requires JCS_EXT_BGRA
--- pkgsrc/www/webkit-gtk/Makefile 2020/11/05 09:07:13 1.196
+++ pkgsrc/www/webkit-gtk/Makefile 2020/11/06 15:06:49 1.197
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.196 2020/11/05 09:07:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.197 2020/11/06 15:06:49 nia Exp $
DISTNAME= webkitgtk-2.30.2
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -133,6 +133,7 @@
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/harfbuzz-icu/buildlink3.mk"
.include "../../fonts/woff2/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"