Date: Thu, 26 Jun 2008 14:54:26 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: bug-followup@FreeBSD.org Cc: freebsd-openoffice@FreeBSD.org, Marcin Cieslak <saper@system.pl> Subject: Re: ports/121787: Patch for OpenOffice.org to fix icu-3.8 breakage, as well as -CURRENT diablo-jdk breakage Message-ID: <200806261454.29129.jkim@FreeBSD.org> In-Reply-To: <200804231000.m3NA07kR056889@freefall.freebsd.org> References: <200804231000.m3NA07kR056889@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_lX+YIjvzeRgndSy Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline I think the attached patch should fix build with system Freetype2 and internal ICU 3.6 build problem. Please test. Thanks, Jung-uk Kim --Boundary-00=_lX+YIjvzeRgndSy Content-Type: text/x-diff; charset="iso-8859-1"; name="ooo-vcl-ft2-icu.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ooo-vcl-ft2-icu.diff" --- vcl/source/glyphs/makefile.mk.orig 2008-06-26 14:06:46.000000000 -0400 +++ vcl/source/glyphs/makefile.mk 2008-06-26 14:33:28.000000000 -0400 @@ -42,9 +42,9 @@ .INCLUDE : $(PRJ)$/util$/makefile2.pmk .IF "$(SYSTEM_FREETYPE)" == "YES" -CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) +ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) .IF "$(USE_FT_EMBOLDEN)" == "YES" -CFLAGS+=-DUSE_FT_EMBOLDEN +ADDCDEFS+=-DUSE_FT_EMBOLDEN .ENDIF .ENDIF --Boundary-00=_lX+YIjvzeRgndSy--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806261454.29129.jkim>