Date: Fri, 17 May 2013 08:57:28 -0400 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Guido Falsi <madpilot@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org, Jeremy Messenger <mezz@FreeBSD.org> Subject: Re: svn commit: r318349 - in head/print/freetype2: . files Message-ID: <51962938.9040403@FreeBSD.org> In-Reply-To: <5195F547.4080606@FreeBSD.org> References: <201305170131.r4H1Vq5c008324@svn.freebsd.org> <5195C200.6050004@FreeBSD.org> <5195F547.4080606@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2FPGCPXWPACWSEMPHQVID Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Thanks! On 5/17/2013 5:15 AM, Guido Falsi wrote: > On 05/17/13 07:37, Bryan Drewery wrote: >> This breaks x11-fonts/fontconfig (verified as it builds fine with >> 2.4.11, update to 2.4.12 and then fontconfig no longer builds): >> >>> CC fcfreetype.lo >>> In file included from ../fontconfig/fcfreetype.h:27, >>> from fcftint.h:26, >>> from fcfreetype.c:48: >>> /usr/local/include/ft2build.h:56:38: error: >>> freetype/config/ftheader.h: No such file or directory >>> In file included from fcftint.h:26, >>> from fcfreetype.c:48: >>> ../fontconfig/fcfreetype.h:28:10: error: #include expects "FILENAME" >>> or <FILENAME> >>> In file included from fcftint.h:26, >>> from fcfreetype.c:48: >>> ../fontconfig/fcfreetype.h:37: error: expected '=3D', ',', ';', 'asm'= >>> or '__attribute__' before 'FcFreeTypeCharIndex' >>> ../fontconfig/fcfreetype.h:40: error: expected ')' before 'face' >>> ../fontconfig/fcfreetype.h:43: error: expected ')' before 'face' >>> ../fontconfig/fcfreetype.h:46: error: expected declaration specifiers= >>> or '...' before 'FT_Face' >>> ../fontconfig/fcfreetype.h:49: warning: type defaults to 'int' in >>> declaration of 'FT_Face' >>> ../fontconfig/fcfreetype.h:49: error: expected ';', ',' or ')' before= >>> 'f' >>> ../fontconfig/fcfreetype.h:52: warning: type defaults to 'int' in >>> declaration of 'FT_Face' >>> ../fontconfig/fcfreetype.h:52: error: expected ';', ',' or ')' before= >>> 'face' >> >=20 > I think I have a fix for this one. I'm attaching a patch. >=20 > It is working fine in my poudriere builds and makes freetype-config > produce what looks like correct output on the command line. >=20 > Hope it helps! >=20 >> >> >> On 5/16/2013 9:31 PM, Jeremy Messenger wrote: >>> Author: mezz >>> Date: Fri May 17 01:31:51 2013 >>> New Revision: 318349 >>> URL: http://svnweb.freebsd.org/changeset/ports/318349 >>> >>> Log: >>> Update to 2.4.12 and add a new option, CFF_HINTING_ADOBE. The >>> CFF_HINTING_ADOBE is a CFF parsing and hinting engine by Adobe >>> and Google. It is disable by default. >>> >>> PR: ports/178552 >>> Submitted by: pfg >>> >>> Modified: >>> head/print/freetype2/Makefile >>> head/print/freetype2/distinfo >>> head/print/freetype2/files/patch-aa (contents, props changed) >>> head/print/freetype2/pkg-plist >>> >>> Modified: head/print/freetype2/Makefile >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> >>> --- head/print/freetype2/Makefile Fri May 17 01:02:37 2013 =20 >>> (r318348) >>> +++ head/print/freetype2/Makefile Fri May 17 01:31:51 2013 =20 >>> (r318349) >>> @@ -3,7 +3,7 @@ >>> # $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 >>> 18:31:21 kwm Exp $ >>> >>> PORTNAME=3D freetype2 >>> -PORTVERSION=3D 2.4.11 >>> +PORTVERSION=3D 2.4.12 >>> CATEGORIES=3D print >>> MASTER_SITES=3D SF/freetype/${PORTNAME}/${PORTVERSION} \ >>> =20 >>> http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ >>> @@ -27,8 +27,9 @@ USE_GNOME=3D ltverhack:9 >>> LIBTOOLFILES=3D builds/unix/configure >>> CONFIGURE_WRKSRC=3D ${WRKSRC}/builds/unix >>> >>> -OPTIONS_DEFINE=3D LCD_FILTERING >>> +OPTIONS_DEFINE=3D LCD_FILTERING CFF_HINTING_ADOBE >>> LCD_FILTERING_DESC?=3D Sub-pixel rendering (patented) >>> +CFF_HINTING_ADOBE_DESC=3D CFF parsing and hinting engine by Adobe= >>> and Google >>> >>> .include <bsd.port.options.mk> >>> >>> @@ -39,6 +40,10 @@ CFLAGS+=3D -DFT_CONFIG_OPTION_SUBPIXEL_REN >>> pre-patch: >>> @${REINPLACE_CMD} -e >>> 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ >>> ${WRKSRC}/builds/unix/install.mk >>> +.if ${PORT_OPTIONS:MCFF_HINTING_ADOBE} >>> + @${REINPLACE_CMD} -e >>> 's|FT_CFF_HINTING_FREETYPE|FT_CFF_HINTING_ADOBE|g' \ >>> + ${WRKSRC}/src/cff/cffobjs.c >>> +.endif >>> >>> pre-configure: >>> @${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL :=3D >>> $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL :=3D ${WRKDIR}/gnome-libtool|' \ >>> >>> Modified: head/print/freetype2/distinfo >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> >>> --- head/print/freetype2/distinfo Fri May 17 01:02:37 2013 =20 >>> (r318348) >>> +++ head/print/freetype2/distinfo Fri May 17 01:31:51 2013 =20 >>> (r318349) >>> @@ -1,2 +1,2 @@ >>> -SHA256 (freetype-2.4.11.tar.bz2) =3D >>> ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f >>> -SIZE (freetype-2.4.11.tar.bz2) =3D 1546087 >>> +SHA256 (freetype-2.4.12.tar.bz2) =3D >>> a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381 >>> +SIZE (freetype-2.4.12.tar.bz2) =3D 1597205 >>> >>> Modified: head/print/freetype2/files/patch-aa >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> >>> --- head/print/freetype2/files/patch-aa Fri May 17 01:02:37 >>> 2013 (r318348) >>> +++ head/print/freetype2/files/patch-aa Fri May 17 01:31:51 >>> 2013 (r318349) >>> @@ -1,8 +1,8 @@ >>> ---- builds/unix/detect.mk.orig 2006-12-09 13:51:54.000000000 -050= 0 >>> -+++ builds/unix/detect.mk 2007-07-06 12:55:05.000000000 -0400 >>> -@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi) >>> - is_unix :=3D $(strip $(wildcard /sbin/init) \ >>> +--- builds/unix/detect.mk.orig 2013-03-21 13:55:46.000000000 -050= 0 >>> ++++ builds/unix/detect.mk 2013-05-12 17:58:34.000000000 -0500 >>> +@@ -22,6 +22,9 @@ >>> $(wildcard /usr/sbin/init) \ >>> + $(wildcard /dev/null) \ >>> $(wildcard /hurd/auth)) >>> + # FreeBSD is "unix" so just mandate this to fix the build in >>> + # jails that do not have init (see PR#113470). >>> @@ -10,15 +10,15 @@ >>> ifneq ($(is_unix),) >>> >>> PLATFORM :=3D unix >>> -@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix) >>> +@@ -81,9 +84,9 @@ >>> ifdef must_configure >>> ifneq ($(have_Makefile),) >>> # we are building FT2 not in the src tree >>> -- $(TOP_DIR)/builds/unix/configure $(value CFG) >>> -+# $(TOP_DIR)/builds/unix/configure $(value CFG) >>> +- $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value >>> CFG) >>> ++ # $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure >>> $(value CFG) >>> else >>> -- cd builds/unix; ./configure $(value CFG) >>> -+# cd builds/unix; ./configure $(value CFG) >>> +- cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG) >>> ++ # cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG= ) >>> endif >>> endif >>> >>> >>> Modified: head/print/freetype2/pkg-plist >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> >>> --- head/print/freetype2/pkg-plist Fri May 17 01:02:37 2013 =20 >>> (r318348) >>> +++ head/print/freetype2/pkg-plist Fri May 17 01:31:51 2013 =20 >>> (r318349) >>> @@ -12,6 +12,7 @@ include/freetype2/freetype/ftbdf.h >>> include/freetype2/freetype/ftbitmap.h >>> include/freetype2/freetype/ftbzip2.h >>> include/freetype2/freetype/ftcache.h >>> +include/freetype2/freetype/ftcffdrv.h >>> include/freetype2/freetype/ftchapters.h >>> include/freetype2/freetype/ftcid.h >>> include/freetype2/freetype/fterrdef.h >>> >> >> >=20 >=20 --=20 Regards, Bryan Drewery ------enig2FPGCPXWPACWSEMPHQVID Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIbBAEBAgAGBQJRlik5AAoJEG54KsA8mwz5tp0P91UsQ2W8sWnOo/cEIDZ+tcj5 ARhvMvm8tOKctj++wBmnQdqps2sEKgmB8u8fu+nHZKQTOHrf8im3WS+KtKnKvPj6 TVMswd09EuTcPpnb5PaMc15Ac3UZg9c3HnZOgKa9RjmIx3u/bJVCPwejtp2LmiE0 rV/vXUTmQQqe/fWowBE/De8DjpxVjx7iFmmUGjhMkJC5EI1E/udnNGl+tN3bS2rx M5wTLrBVVOzgTzKP5QD1zltAXDH1xFrl+h3NZ7WoNxb/4lk3ba7T+uO2iYcoyJu1 bAY1TGQ3amzIa6/XrKIMs80bE3xjoMu5oUVftTfE7Kr4xlCileF2JYaGUi+ckPfh joY+T660joUVbEyPtDu+9tpdz+mmtu3Db27T3jgJ7JTCwOTPQ/d8Tbo9GSvgqW8R fM5uoQDB6Yv8KbDrMB4WCyfl16GCcwdK75lk/bacmsQxufNxkGVAYDvVm24c8lev /S9UJouXwOLVBFDWCYMUpkAsURpB7tLX7L08rIm2Ce3g30XwQSUp2jxI0wTYTR2G thVX41fI5rPkg2FnOj5Z8MDxrvYEvc5GfZEpRJpkmuIp4J1nRzasQg+7iXM2jZET IPZy4cFhySW+4d58UAKyxSod4AN2MVL5iBLT7dhFrZHsoiCNBkAgi3L2usFxYC95 DEPowCCAmNeJ6kLqBgo= =idev -----END PGP SIGNATURE----- ------enig2FPGCPXWPACWSEMPHQVID--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51962938.9040403>