diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-13 11:06:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-13 11:06:34 +0000 |
| commit | dd7c21a410e0d1217e34dc07af7820004d5724be (patch) | |
| tree | 88eeb03a6a8904b3bd203a5285671f74159ade05 /expat/expat-2.0.1.patch | |
| parent | 2f0d4473749af8df0e2acd611f18c9c72bb769f3 (diff) | |
#i106889# upgrade expat to 2.0.1
Diffstat (limited to 'expat/expat-2.0.1.patch')
| -rw-r--r-- | expat/expat-2.0.1.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch new file mode 100644 index 000000000000..1be45d10c5ac --- /dev/null +++ b/expat/expat-2.0.1.patch @@ -0,0 +1,93 @@ +--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 ++++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 +@@ -1 +1,89 @@ +-dummy ++#************************************************************************* ++# ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# Copyright 2008 by Sun Microsystems, Inc. ++# ++# OpenOffice.org - a multi-platform office productivity suite ++# ++# $RCSfile: header.hxx,v $ ++# ++# $Revision: 1.1 $ ++# ++# This file is part of OpenOffice.org. ++# ++# OpenOffice.org is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License version 3 ++# only, as published by the Free Software Foundation. ++# ++# OpenOffice.org is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU Lesser General Public License version 3 for more details ++# (a copy is included in the LICENSE file that accompanied this code). ++# ++# You should have received a copy of the GNU Lesser General Public License ++# version 3 along with OpenOffice.org. If not, see ++# <http://www.openoffice.org/license.html> ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=expat ++TARGET=expat ++LIBTARGET=NO ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++# --- Settings ----------------------------------------------------- ++.INCLUDE : settings.mk ++# --- Files -------------------------------------------------------- ++ ++CFLAGS+=-I.. ++ ++.IF "$(OS)"=="WNT" ++CDEFS+=-DCOMPILED_FROM_DSP ++.ELSE ++CDEFS+=-DHAVE_EXPAT_CONFIG_H ++.ENDIF ++ ++SLOFILES=$(SLO)$/xmlparse.obj \ ++ $(SLO)$/xmlrole.obj \ ++ $(SLO)$/xmltok.obj ++ ++SECOND_BUILD=UNICODE ++UNICODE_SLOFILES=$(SLO)$/xmlparse.obj ++UNICODECDEFS+=-DXML_UNICODE ++ ++LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a ++LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib ++LIB1OBJFILES=$(SLO)$/xmlparse.obj ++ ++LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a ++LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib ++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) ++ ++LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a ++LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib ++LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj ++ ++.IF "$(BUILD_X64)"!="" ++# ---------------- X64 stuff special --------------------- ++# use UNICODE only because shell/shlxthandler ++# doesn't link against ascii_expat_xmlparse ++#--------------------------------------------------------- ++SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \ ++ $(SLO_X64)$/xmlrole.obj \ ++ $(SLO_X64)$/xmltok.obj ++CDEFS_X64+=-DXML_UNICODE ++CFLAGS_X64+=-I.. ++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib ++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj ++LIB3TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib ++LIB3OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj ++.ENDIF # "$(BUILD_X64)"!="" ++ ++# --- Targets ------------------------------------------------------ ++.INCLUDE : set_wntx64.mk ++.INCLUDE : target.mk ++.INCLUDE : tg_wntx64.mk |