From owner-freebsd-gnome@freebsd.org Sat Oct 29 07:50:45 2016 Return-Path: Delivered-To: freebsd-gnome@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D17FC2503C for ; Sat, 29 Oct 2016 07:50:45 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id EACF1ED1 for ; Sat, 29 Oct 2016 07:50:44 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id E7785C2503B; Sat, 29 Oct 2016 07:50:44 +0000 (UTC) Delivered-To: gnome@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E56EBC2503A for ; Sat, 29 Oct 2016 07:50:44 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2AD3ECF for ; Sat, 29 Oct 2016 07:50:44 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id u9T7ogCJ031724 for ; Sat, 29 Oct 2016 07:50:44 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gnome@FreeBSD.org Subject: [Bug 211201] print/freetype2: update to 2.7, add V40 code Date: Sat, 29 Oct 2016 07:50:42 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-qa, patch X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: jbeich@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: jbeich@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? exp-run? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2016 07:50:45 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D211201 --- Comment #55 from Jan Beich (mail not working) --- Comment on attachment 175507 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D175507 Proposed patch (since 412348 revision) Resuming review. I'm uneasy to land this per timeout due to the following s= tyle issues: > +SUBPIXEL_HINTING_DESC=3D Sub-pixel hinting support > +V38_DESC=3D v38 mode (Infinality code) > +V38_VARS=3D SUBPIXEL_HINTING_MODE+=3D1 > +V40_DESC=3D v40 mode (minimal code, a.k.a. ClearType hinting) > +V40_VARS=3D SUBPIXEL_HINTING_MODE+=3D2 > + > +.include > + > +SELECTED_MODE=3D r=3D0; for m in ${SUBPIXEL_HINTING_MODE};\ > + do r=3D$$(($$r | $$m)); done; ${ECHO_CMD} $$r > [...] > +post-patch: > +.if defined(SUBPIXEL_HINTING_MODE) > + @${REINPLACE_CMD} -e \ > + 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING\).*|\1 \ > + ${SELECTED_MODE:sh}|' \ > + ${WRKSRC}/include/freetype/config/ftoption.h > +.else > + @${REINPLACE_CMD} -e \ > + 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING.*\)|/* \1 */|' \ > + ${WRKSRC}/include/freetype/config/ftoption.h > +.endif Can we avoid the complexity in this case? It'd even be 4 lines shorter. SUBPIXEL_HINTING_DESC=3D Sub-pixel hinting support V38_DESC=3D v38 mode (Infinality code) V40_DESC=3D v40 mode (minimal code, a.k.a. ClearType hinting) .include .if ${PORT_OPTIONS:MV38} && ${PORT_OPTIONS:MV40} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D3 .elif ${PORT_OPTIONS:MV40} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D2 .elif ${PORT_OPTIONS:MV38} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D1 .endif post-patch: # warning: 'TT_CONFIG_OPTION_SUBPIXEL_HINTING' macro redefined [-Wmacro-redefined] @${REINPLACE_CMD} -e '/^#define TT_CONFIG_OPTION_SUBPIXEL_HINTING= /d' \ ${WRKSRC}/include/freetype/config/ftoption.h > +post-patch-DEBUG-on: > + @${SED} -i '.d.bak' -e 's|.*\(#define FT_DEBUG_LEVEL_TRACE\).*|\1| ; \ > + s|.*\(#define FT_DEBUG_MEMORY\).*|\1|' \ > + ${WRKSRC}/include/freetype/config/ftoption.h > + - Use "-e" option to split commands rather than ";" to avoid tracking open quotes - Don't use SED when modifying in-place - Make backup suffix a bit more verbose than just one confusing letter Here's what I have in mind: post-patch-DEBUG-on: @${REINPLACE_CMD} -i '.bak.DEBUG' \ -e 's/.*\(#define FT_DEBUG_LEVEL_TRACE\).*/\1/' \ -e 's/.*\(#define FT_DEBUG_MEMORY\).*/\1/' \ ${WRKSRC}/include/freetype/config/ftoption.h --=20 You are receiving this mail because: You are on the CC list for the bug.=