Attachment 172973 Details for Bug 211363 – Proposed patch (since 418357 revision)

[patch] Proposed patch (since 418357 revision)

harfbuzz.diff (text/plain), 2.47 KB, created by lightside on 2016-07-25 16:24:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-07-25 16:24:11 UTC

Size: 2.47 KB

patch

obsolete

>diff -ruN harfbuzz.orig/Makefile harfbuzz/Makefile
>--- harfbuzz.orig/Makefile	2016-07-11 12:21:36.000000000 +0400
>+++ harfbuzz/Makefile	2016-07-25 10:03:17.586527000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/print/harfbuzz/Makefile 418357 2016-07-11 08:21:36Z jbeich $
> 
> PORTNAME=	harfbuzz
>-PORTVERSION=	1.2.7
>+PORTVERSION=	1.3.0
> CATEGORIES=	print
> MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
> 
>@@ -21,7 +21,7 @@
> INSTALL_TARGET=	install-strip
> TEST_TARGET=	check
> 
>-PLIST_SUB+=	LIBVER=0.10200.7
>+PLIST_SUB+=	LIBVER=0.10300.0
> 
> EXTRA_PATCHES+=	${EXTRA_PATCHES_${OPSYS}_${OSREL:R}}
> EXTRA_PATCHES_FreeBSD_9=	${PATCHDIR}/extra-src_hb-open-type-private.hh
>diff -ruN harfbuzz.orig/distinfo harfbuzz/distinfo
>--- harfbuzz.orig/distinfo	2016-07-11 12:21:36.000000000 +0400
>+++ harfbuzz/distinfo	2016-07-25 10:02:29.131597000 +0400
>@@ -1,2 +1,3 @@
>-SHA256 (harfbuzz-1.2.7.tar.bz2) = bba0600ae08b84384e6d2d7175bea10b5fc246c4583dc841498d01894d479026
>-SIZE (harfbuzz-1.2.7.tar.bz2) = 1345389
>+TIMESTAMP = 1469091491
>+SHA256 (harfbuzz-1.3.0.tar.bz2) = b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d
>+SIZE (harfbuzz-1.3.0.tar.bz2) = 1351234
>diff -ruN harfbuzz.orig/files/patch-configure harfbuzz/files/patch-configure
>--- harfbuzz.orig/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
>+++ harfbuzz/files/patch-configure	2016-07-25 19:20:54.629930000 +0400
>@@ -0,0 +1,16 @@
>+# Origin: https://cgit.freedesktop.org/harfbuzz/commit/?id=dd31fc9f7e6d23b414b22874de96eb3c002c80ba
>+# Subject: Don't build UCDN support when building with GLib (#296)
>+# Regression from: b424b6c372dfe4c0ed75a49761eb34a416819446.
>+# Applied to configure instead of configure.ac file, because it was generated.
>+
>+--- configure.orig	2016-07-21 08:57:54 UTC
>++++ configure
>+@@ -18678,7 +18678,7 @@ fi
>+ 
>+ 
>+ have_ucdn=true
>+-if $have_glib || $have_icu && test "x$with_icu" = "xbuiltin"; then
>++if $have_glib || test $ $have_icu -a "x$with_icu" = "xbuiltin" $; then
>+ 	have_ucdn=false
>+ fi
>+ if $have_ucdn; then
>diff -ruN harfbuzz.orig/pkg-plist harfbuzz/pkg-plist
>--- harfbuzz.orig/pkg-plist	2016-03-03 14:10:11.000000000 +0400
>+++ harfbuzz/pkg-plist	2016-07-25 12:30:03.850072000 +0400
>@@ -95,6 +95,7 @@
> 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/index.sgml
> share/gtk-doc/html/harfbuzz/install-harfbuzz.html
> share/gtk-doc/html/harfbuzz/left-insensitive.png
> share/gtk-doc/html/harfbuzz/left.png

Flags:

lightside: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 211363: 172967 | 172973