Attachment 172884 Details for Bug 211201 – Proposed patch (since 412348 revision)

[patch] Proposed patch (since 412348 revision)

freetype2.diff (text/plain), 3.82 KB, created by lightside on 2016-07-23 11:01:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-07-23 11:01:57 UTC

Size: 3.82 KB

patch

obsolete

>diff -ruN freetype2.orig/Makefile freetype2/Makefile
>--- freetype2.orig/Makefile	2016-04-01 18:17:44.000000000 +0400
>+++ freetype2/Makefile	2016-07-23 13:18:31.752038000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/print/freetype2/Makefile 412348 2016-04-01 14:17:44Z mat $
> 
> PORTNAME=	freetype2
>-PORTVERSION=	2.6.3
>+PORTVERSION=	2.6.5
> CATEGORIES=	print
> MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
> 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
>@@ -15,6 +15,14 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Free and portable TrueType font rendering engine
> 
>+LICENSE=	FREETYPE2 BSD3CLAUSE GPLv2
>+LICENSE_COMB=	dual
>+LICENSE_NAME_FREETYPE2=	The FreeType 2 font engine licenses
>+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/docs/FTL.TXT
>+LICENSE_FILE_GPLv2=	${WRKSRC}/docs/GPLv2.TXT
>+LICENSE_FILE_FREETYPE2=	${WRKSRC}/docs/LICENSE.TXT
>+LICENSE_PERMS_FREETYPE2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
> USES=		cpe gmake libtool tar:bzip2
> MAKE_ENV=	TOP=""
> USE_LDCONFIG=	yes
>@@ -26,15 +34,24 @@
> CPE_VENDOR=	freetype
> 
> OPTIONS_DEFINE=		LCD_FILTERING PNG
>+OPTIONS_RADIO=		SUBPIXEL_HINTING
>+OPTIONS_RADIO_SUBPIXEL_HINTING=	V38 V40 BOTH
> OPTIONS_DEFAULT=	LCD_FILTERING
>-LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
>-PNG_DESC=		Png compressed OpenType embedded bitmaps support
> 
>+LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
> LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
>-
>+PNG_DESC=		Png compressed OpenType embedded bitmaps support
> PNG_LIB_DEPENDS=	libpng.so:graphics/png
> PNG_CONFIGURE_OFF=	--without-png
> 
>+SUBPIXEL_HINTING_DESC=	Sub-pixel hinting support
>+V38_DESC=	v38 mode (Infinality code)
>+V38_CFLAGS=	-DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1
>+V40_DESC=	v40 mode (Minimal code, a.k.a ClearType hinting)
>+V40_CFLAGS=	-DTT_CONFIG_OPTION_SUBPIXEL_HINTING=2
>+BOTH_DESC=	Compile both (v38 and v40)
>+BOTH_CFLAGS=	-DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3
>+
> pre-patch:
> 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
> 		${WRKSRC}/builds/unix/install.mk
>diff -ruN freetype2.orig/distinfo freetype2/distinfo
>--- freetype2.orig/distinfo	2016-03-03 14:12:38.000000000 +0400
>+++ freetype2/distinfo	2016-07-19 14:47:22.631788000 +0400
>@@ -1,2 +1,3 @@
>-SHA256 (freetype-2.6.3.tar.bz2) = 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2
>-SIZE (freetype-2.6.3.tar.bz2) = 1753083
>+TIMESTAMP = 1468301305
>+SHA256 (freetype-2.6.5.tar.bz2) = e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0
>+SIZE (freetype-2.6.5.tar.bz2) = 1779603
>diff -ruN freetype2.orig/files/patch-builds_unix_detect.mk freetype2/files/patch-builds_unix_detect.mk
>--- freetype2.orig/files/patch-builds_unix_detect.mk	2015-12-11 02:13:58.000000000 +0400
>+++ freetype2/files/patch-builds_unix_detect.mk	2016-07-23 13:14:38.376524000 +0400
>@@ -1,6 +1,6 @@
>---- builds/unix/detect.mk.orig	2015-09-25 07:58:57.000000000 +0200
>-+++ builds/unix/detect.mk	2015-10-04 12:35:05.733855000 +0200
>-@@ -22,6 +22,9 @@
>+--- builds/unix/detect.mk.orig	2016-02-03 18:13:58 UTC
>++++ builds/unix/detect.mk
>+@@ -22,6 +22,9 @@ ifeq ($(PLATFORM),ansi)
>                       $(wildcard /usr/sbin/init) \
>                       $(wildcard /dev/null) \
>                       $(wildcard /hurd/auth))
>@@ -10,7 +10,7 @@
>    ifneq ($(is_unix),)
>  
>      PLATFORM := unix
>-@@ -80,10 +83,10 @@
>+@@ -80,10 +83,10 @@ ifeq ($(PLATFORM),unix)
>    ifdef must_configure
>      ifneq ($(have_Makefile),)
>        # we are building FT2 not in the src tree
>diff -ruN freetype2.orig/pkg-plist freetype2/pkg-plist
>--- freetype2.orig/pkg-plist	2016-03-03 14:12:38.000000000 +0400
>+++ freetype2/pkg-plist	2016-07-19 14:57:41.426104000 +0400
>@@ -53,7 +53,7 @@
> lib/libfreetype.a
> lib/libfreetype.so
> lib/libfreetype.so.6
>-lib/libfreetype.so.6.12.3
>+lib/libfreetype.so.6.12.5
> libdata/pkgconfig/freetype2.pc
> man/man1/freetype-config.1.gz
> share/aclocal/freetype2.m4

Actions: View | Diff

Attachments on bug 211201: 172664 | 172665 | 172884 | 172885 | 172886 | 172887 | 172889 | 172891 | 172892 | 172893 | 172896 | 172900 | 172904 | 172906 | 172907 | 172919 | 173436 | 173438 | 174580 | 175459 | 175471 | 175507 | 176248 | 176249 | 176250 | 176263 | 176284 | 176285 | 176286 | 176307 | 178524 | 178525 | 178526 | 179958 | 179969 | 179970 | 180685