Attachment 181982 Details for Bug 207779 – Reworked harfbuzz-icu split off patch

[patch] Reworked harfbuzz-icu split off patch

harfbuzz-icu-split.diff (text/plain), 9.82 KB, created by Koop Mast on 2017-04-21 18:35:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2017-04-21 18:35:35 UTC

Size: 9.82 KB

patch

obsolete

>Index: editors/libreoffice/Makefile
>===================================================================
>--- editors/libreoffice/Makefile	(revision 439104)
>+++ editors/libreoffice/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> .include "${.CURDIR}/Makefile.common"
> 
>-PORTREVISION=	2
>+PORTREVISION=	3
> MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
> 		http://dev-www.libreoffice.org/src/:src \
> 		http://dev-www.libreoffice.org/extern/:ext
>@@ -50,6 +50,7 @@
> 		liblpsolve55.so:math/lp_solve \
> 		libcmis-0.5.so:net/libcmis \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libmspub-0.1.so:print/libmspub01 \
> 		libpagemaker-0.0.so:print/libpagemaker \
> 		libnss3.so:security/nss \
>Index: print/Makefile
>===================================================================
>--- print/Makefile	(revision 439104)
>+++ print/Makefile	(working copy)
>@@ -88,6 +88,7 @@
>     SUBDIR += gutenprint-ijs
>     SUBDIR += gv
>     SUBDIR += harfbuzz
>+    SUBDIR += harfbuzz-icu
>     SUBDIR += hp2xx
>     SUBDIR += hpijs
>     SUBDIR += hplip
>Index: print/harfbuzz/Makefile
>===================================================================
>--- print/harfbuzz/Makefile	(revision 439104)
>+++ print/harfbuzz/Makefile	(working copy)
>@@ -3,19 +3,18 @@
> 
> PORTNAME=	harfbuzz
> PORTVERSION=	1.4.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	print
> MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
> 
> MAINTAINER=	gnome@FreeBSD.org
>-COMMENT=	OpenType text shaping engine
>+COMMENT?=	OpenType text shaping engine
> 
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
>-		libicudata.so:devel/icu \
> 		libgraphite2.so:graphics/graphite2
> 
> USE_LDCONFIG=	yes
>-USES=		compiler:c++0x gettext-runtime gmake gnome libtool \
>+USES=		gettext-runtime gmake gnome libtool \
> 		pathfix pkgconfig tar:bzip2
> USE_GNOME=	cairo glib20 introspection:build
> GNU_CONFIGURE=	yes
>@@ -25,4 +24,20 @@
> 
> PLIST_SUB+=	LIBVER=0.10400.5
> 
>+HARFBUZZ_SLAVE?=	no
>+
>+.if ${HARFBUZZ_SLAVE} == no
>+CONFIGURE_ARGS+=	--without-icu
>+.else
>+CONFIGURE_ARGS+=	--with-icu \
>+		--disable-gtk-doc-html
>+USES+=		compiler:c++0x
>+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>
>Index: print/harfbuzz/pkg-plist
>===================================================================
>--- print/harfbuzz/pkg-plist	(revision 439104)
>+++ print/harfbuzz/pkg-plist	(working copy)
>@@ -13,7 +13,6 @@
> include/harfbuzz/hb-gobject-structs.h
> include/harfbuzz/hb-gobject.h
> include/harfbuzz/hb-graphite2.h
>-include/harfbuzz/hb-icu.h
> include/harfbuzz/hb-ot-font.h
> include/harfbuzz/hb-ot-layout.h
> include/harfbuzz/hb-ot-math.h
>@@ -31,14 +30,10 @@
> 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.so
> lib/libharfbuzz.so.0
> lib/libharfbuzz.so.%%LIBVER%%
> libdata/pkgconfig/harfbuzz-gobject.pc
>-libdata/pkgconfig/harfbuzz-icu.pc
> libdata/pkgconfig/harfbuzz.pc
> share/gir-1.0/HarfBuzz-0.0.gir
> share/gtk-doc/html/harfbuzz/HarfBuzz.png
>Index: print/harfbuzz-icu/Makefile
>===================================================================
>--- print/harfbuzz-icu/Makefile	(nonexistent)
>+++ print/harfbuzz-icu/Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+# $FreeBSD$
>+
>+PKGNAMESUFFIX=	-icu
>+
>+COMMENT=	Harfbuzz ICU support
>+
>+MASTERDIR=	${.CURDIR}/../../print/harfbuzz
>+PLIST=		pkg-plist
>+HARFBUZZ_SLAVE=	icu
>+
>+.include "${MASTERDIR}/Makefile"
>
>Property changes on: print/harfbuzz-icu/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/harfbuzz-icu/pkg-plist
>===================================================================
>--- print/harfbuzz-icu/pkg-plist	(nonexistent)
>+++ print/harfbuzz-icu/pkg-plist	(working copy)
>@@ -0,0 +1,43 @@
>+@comment bin/hb-ot-shape-closure
>+@comment bin/hb-shape
>+@comment bin/hb-view
>+@comment include/harfbuzz/hb-blob.h
>+@comment include/harfbuzz/hb-buffer.h
>+@comment include/harfbuzz/hb-common.h
>+@comment include/harfbuzz/hb-deprecated.h
>+@comment include/harfbuzz/hb-face.h
>+@comment include/harfbuzz/hb-font.h
>+@comment include/harfbuzz/hb-ft.h
>+@comment include/harfbuzz/hb-glib.h
>+@comment include/harfbuzz/hb-gobject-enums.h
>+@comment include/harfbuzz/hb-gobject-structs.h
>+@comment include/harfbuzz/hb-gobject.h
>+@comment include/harfbuzz/hb-graphite2.h
>+include/harfbuzz/hb-icu.h
>+@comment include/harfbuzz/hb-ot-font.h
>+@comment include/harfbuzz/hb-ot-layout.h
>+@comment include/harfbuzz/hb-ot-math.h
>+@comment include/harfbuzz/hb-ot-shape.h
>+@comment include/harfbuzz/hb-ot-tag.h
>+@comment include/harfbuzz/hb-ot-var.h
>+@comment include/harfbuzz/hb-ot.h
>+@comment include/harfbuzz/hb-set.h
>+@comment include/harfbuzz/hb-shape-plan.h
>+@comment include/harfbuzz/hb-shape.h
>+@comment include/harfbuzz/hb-unicode.h
>+@comment include/harfbuzz/hb-version.h
>+@comment include/harfbuzz/hb.h
>+@comment lib/girepository-1.0/HarfBuzz-0.0.typelib
>+@comment lib/libharfbuzz-gobject.so
>+@comment lib/libharfbuzz-gobject.so.0
>+@comment lib/libharfbuzz-gobject.so.%%LIBVER%%
>+lib/libharfbuzz-icu.so
>+lib/libharfbuzz-icu.so.0
>+lib/libharfbuzz-icu.so.%%LIBVER%%
>+@comment lib/libharfbuzz.so
>+@comment lib/libharfbuzz.so.0
>+@comment lib/libharfbuzz.so.%%LIBVER%%
>+@comment libdata/pkgconfig/harfbuzz-gobject.pc
>+libdata/pkgconfig/harfbuzz-icu.pc
>+@comment libdata/pkgconfig/harfbuzz.pc
>+@comment share/gir-1.0/HarfBuzz-0.0.gir
>
>Property changes on: print/harfbuzz-icu/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>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
>Index: print/tex-xetex/Makefile
>===================================================================
>--- print/tex-xetex/Makefile	(revision 439104)
>+++ print/tex-xetex/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	xetex
> PORTVERSION=	0.99992
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	print
> MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
> PKGNAMEPREFIX=	tex-
>@@ -19,6 +19,7 @@
> 		libgraphite2.so:graphics/graphite2 \
> 		libicuio.so:devel/icu \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libpng.so:graphics/png \
> 		libpoppler.so:graphics/poppler \
> 		libTECkit.so:textproc/teckit
>Index: print/texlive-base/Makefile
>===================================================================
>--- print/texlive-base/Makefile	(revision 439104)
>+++ print/texlive-base/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	texlive
> PORTVERSION=	20150521
>-PORTREVISION=	15
>+PORTREVISION=	16
> CATEGORIES=	print
> MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
> PKGNAMESUFFIX=	-base
>@@ -20,6 +20,7 @@
> 		libgraphite2.so:graphics/graphite2 \
> 		libfreetype.so:print/freetype2 \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libpng.so:graphics/png \
> 		libzzip.so:devel/zziplib \
> 		libpoppler.so:graphics/poppler \
>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 439104)
>+++ www/chromium/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	57.0.2987.133
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
>@@ -46,6 +47,7 @@
> 		libcups.so:print/cups \
> 		libfreetype.so:print/freetype2 \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libgcrypt.so:security/libgcrypt \
> 		libgnome-keyring.so:security/libgnome-keyring \
> 		libnss3.so:security/nss \
>Index: www/webkit-gtk2/Makefile
>===================================================================
>--- www/webkit-gtk2/Makefile	(revision 439104)
>+++ www/webkit-gtk2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	webkit
> PORTVERSION=	2.4.11
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
> PKGNAMESUFFIX=	-gtk2
>@@ -20,6 +20,7 @@
> 		libsecret-1.so:security/libsecret \
> 		libicutu.so:devel/icu \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libpng16.so:graphics/png \
> 		libwebp.so:graphics/webp \
> 		libcurl.so:ftp/curl \
>Index: www/webkit-gtk3/Makefile
>===================================================================
>--- www/webkit-gtk3/Makefile	(revision 439104)
>+++ www/webkit-gtk3/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	webkit
> PORTVERSION=	2.4.11
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
> PKGNAMESUFFIX=	-gtk3
>@@ -20,6 +20,7 @@
> 		libsecret-1.so:security/libsecret \
> 		libicutu.so:devel/icu \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libwebp.so:graphics/webp \
> 		libcurl.so:ftp/curl \
> 		libsoup-2.4.so:devel/libsoup
>Index: www/webkit2-gtk3/Makefile
>===================================================================
>--- www/webkit2-gtk3/Makefile	(revision 439104)
>+++ www/webkit2-gtk3/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	webkit
> PORTVERSION=	2.8.5
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
> PKGNAMESUFFIX=	2-gtk3
>@@ -22,6 +22,7 @@
> 		libsecret-1.so:security/libsecret \
> 		libicutu.so:devel/icu \
> 		libharfbuzz.so:print/harfbuzz \
>+		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libsoup-2.4.so:devel/libsoup
> RUN_DEPENDS=	geoclue>=0:net/geoclue
>

Actions: View | Diff

Attachments on bug 207779: 167815 | 167816 | 181982