Date: Sat, 29 Oct 2016 07:50:42 +0000 From: bugzilla-noreply@freebsd.org To: gnome@FreeBSD.org Subject: [Bug 211201] print/freetype2: update to 2.7, add V40 code Message-ID: <bug-211201-6497-X62wuXrwYM@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-211201-6497@https.bugs.freebsd.org/bugzilla/> References: <bug-211201-6497@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D211201 --- Comment #55 from Jan Beich (mail not working) <jbeich@FreeBSD.org> --- 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 <bsd.port.pre.mk> > + > +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 <bsd.port.options.mk> .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.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-211201-6497-X62wuXrwYM>