expat: upgrade to 2.1.0 release

5 files changed, 32 insertions, 52 deletions

diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.1.0.patch
index 95b573a3d007..875e41dc4321 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.1.0.patch
@@ -1,25 +1,5 @@
---- misc/expat-2.0.1/conftools/config.sub	2006-09-22 16:42:54.000000000 +0200
-+++ misc/build/expat-2.0.1/conftools/config.sub	2011-09-26 22:45:56.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1211,7 +1211,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
---- 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
+--- misc/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,90 @@
 -dummy
 +#*************************************************************************
@@ -48,7 +28,7 @@
 +# for a copy of the LGPLv3 License.
 +#
 +#*************************************************************************
-+PRJ=..$/..$/..$/..$/..
++PRJ=../../../../..
 +
 +PRJNAME=expat
 +TARGET=expat
@@ -72,40 +52,40 @@
 +CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
 +.ENDIF # "$(OS)"=="MACOSX"
 +
-+SLOFILES=$(SLO)$/xmlparse.obj \
-+         $(SLO)$/xmlrole.obj \
-+         $(SLO)$/xmltok.obj
++SLOFILES=$(SLO)/xmlparse.obj \
++         $(SLO)/xmlrole.obj \
++         $(SLO)/xmltok.obj
 +
 +SECOND_BUILD=UNICODE
-+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
++UNICODE_SLOFILES=$(SLO)/xmlparse.obj
 +UNICODECDEFS+=-DXML_UNICODE
 +
-+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
-+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
-+LIB1OBJFILES=$(SLO)$/xmlparse.obj
++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
++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
++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
++SLOFILES_X64=$(SLO_X64)/xmlparse.obj \
++             $(SLO_X64)/xmlrole.obj \
++             $(SLO_X64)/xmltok.obj
 +CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
 +CFLAGS_X64+=-I..
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
-+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
-+LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
-+LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
++LIB1TARGET_X64=$(SLB_X64)/$(TARGET)_xmlparse.lib
++LIB1OBJFILES_X64=$(SLO_X64)/xmlparse.obj
++LIB2TARGET_X64=$(SLB_X64)/$(TARGET)_xmltok.lib
++LIB2OBJFILES_X64=$(SLO_X64)/xmlrole.obj $(SLO_X64)/xmltok.obj
 +.ENDIF # "$(BUILD_X64)"!=""
 +
 +# --- Targets ------------------------------------------------------
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
index dfac519f2ed2..070dafc0cb0c 100644
--- a/expat/expat-winapi.patch
+++ b/expat/expat-winapi.patch
@@ -1,5 +1,5 @@
---- misc/expat-2.0.1/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
-+++ misc/build/expat-2.0.1/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
+--- misc/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
++++ misc/build/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
 @@ -7,10 +7,6 @@
  
  /* External API definitions */
diff --git a/expat/makefile.mk b/expat/makefile.mk
index 857468e4b4c7..7deffd66eeab 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -42,17 +42,17 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=expat-2.0.1
-TARFILE_MD5=ee8b492592568805593f81f8cdf2a04c
-ADDITIONAL_FILES=lib$/makefile.mk
-PATCH_FILES=expat-2.0.1.patch \
+TARFILE_NAME=expat-2.1.0
+TARFILE_MD5=dd7dab7a5fea97d2a6a43f511449b7cd
+ADDITIONAL_FILES=lib/makefile.mk
+PATCH_FILES=expat-2.1.0.patch \
             expat-winapi.patch
 
 CONFIGURE_DIR=
 .IF "$(OS)"=="WNT"
 CONFIGURE_ACTION=
 .ELSE
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=./configure
 .ENDIF
 
 .IF "$(CROSS_COMPILING)"=="YES"
diff --git a/expat/prj/d.lst b/expat/prj/d.lst
index 887a0816a00f..9b6aa344cf1d 100644
--- a/expat/prj/d.lst
+++ b/expat/prj/d.lst
@@ -1,7 +1,7 @@
 mkdir: %_DEST%\inc\external\expat
 mkdir: %_DEST%\lib\x64
-..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc\external\expat.h
-..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.1.0\lib\expat.h %_DEST%\inc\external\expat.h
+..\%__SRC%\misc\build\expat-2.1.0\lib\expat_external.h %_DEST%\inc\external\expat_external.h
 ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib\expat_xmltok.lib
 ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib\expat_xmlparse.lib
 ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib\ascii_expat_xmlparse.lib
diff --git a/ooo.lst.in b/ooo.lst.in
index dbac8daeaf51..ac836591d119 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -46,7 +46,7 @@ e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
 e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
+dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz