Date: Fri, 16 Nov 2007 12:25:59 +0100 From: "Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/118084: [patch] graphics/gltt unbreak fix build with GCC 4.2 Message-ID: <1195212359.29043@gahrtop.localhost> Resent-Message-ID: <200711161130.lAGBU2VU003792@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118084
>Category: ports
>Synopsis: [patch] graphics/gltt unbreak fix build with GCC 4.2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 16 11:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 8.0-CURRENT #11: Wed Nov 14 20:31:46 CET 2007
root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034
>Description:
- fixed build with FreeType1
- fixed build with GCC 4.2
>How-To-Repeat:
cd /usr/ports/graphics/gltt && make
>Fix:
--- _gltt.diff begins here ---
--- Makefile.orig 2007-11-16 11:48:22.000000000 +0100
+++ Makefile 2007-11-16 11:58:15.000000000 +0100
@@ -24,7 +24,7 @@
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib"
-CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \
+CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype \
--with-ttf-libraries=${LOCALBASE}/lib \
--with-gl-includes=${X11BASE}/include \
--with-gl-libraries=${X11BASE}/lib \
@@ -32,10 +32,10 @@
--with-glut-libraries=${X11BASE}/lib
USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
+post-patch:
+ ${REINPLACE_CMD} -e 's,freetype/freetype.h,freetype1/freetype/freetype.h,g' \
+ ${WRKSRC}/*
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
--- /dev/null 2007-11-16 12:00:00.000000000 +0100
+++ files/patch-GLTTGlyphPolygonizerHandler.h 2007-11-16 12:00:15.000000000 +0100
@@ -0,0 +1,10 @@
+--- GLTTGlyphPolygonizerHandler.h.orig 2007-11-16 11:59:00.000000000 +0100
++++ GLTTGlyphPolygonizerHandler.h 2007-11-16 11:59:58.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include "FTGlyphVectorizer.h"
+ #endif
+
++class GLTTGlyphPolygonizer;
+ /////////////////////////////////////////////////////////////////////////////
+
+ // Mmh, this class name is a bit long... /SR
--- _gltt.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1195212359.29043>