From owner-freebsd-openoffice@FreeBSD.ORG  Thu Jun 26 18:54:39 2008
Return-Path: <owner-freebsd-openoffice@FreeBSD.ORG>
Delivered-To: freebsd-openoffice@FreeBSD.org
Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id 5BA701065671;
	Thu, 26 Jun 2008 18:54:39 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
From: Jung-uk Kim <jkim@FreeBSD.org>
To: bug-followup@FreeBSD.org
Date: Thu, 26 Jun 2008 14:54:26 -0400
User-Agent: KMail/1.6.2
References: <200804231000.m3NA07kR056889@freefall.freebsd.org>
In-Reply-To: <200804231000.m3NA07kR056889@freefall.freebsd.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_lX+YIjvzeRgndSy"
Message-Id: <200806261454.29129.jkim@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
X-BeenThere: freebsd-openoffice@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting OpenOffice to FreeBSD <freebsd-openoffice.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>, 
	<mailto:freebsd-openoffice-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-openoffice>
List-Post: <mailto:freebsd-openoffice@freebsd.org>
List-Help: <mailto:freebsd-openoffice-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>, 
	<mailto:freebsd-openoffice-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jun 2008 18:54:39 -0000


--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--