[Libreoffice-commits] .: Branch 'libreoffice-3-5' - expat/expat-2.0.1.patch expat/expat-2.1.0.patch expat/expat-winapi.patch expat/makefile.mk expat/prj ooo.lst.in

Petr Mladek pmladek at kemper.freedesktop.org
Tue May 15 04:45:07 PDT 2012 

 expat/expat-2.0.1.patch  |  114 -----------------------------------------------
 expat/expat-2.1.0.patch  |   94 ++++++++++++++++++++++++++++++++++++++
 expat/expat-winapi.patch |    4 -
 expat/makefile.mk        |   10 ++--
 expat/prj/d.lst          |    4 -
 ooo.lst.in               |    2 
 6 files changed, 104 insertions(+), 124 deletions(-)

New commits:
commit ba65e7ebc4bc06ad454e9f9debbcbcd83be7bc49
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Apr 30 13:42:53 2012 +0200

    expat: upgrade to 2.1.0 release
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
deleted file mode 100644
index 95b573a..0000000
--- a/expat/expat-2.0.1.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- 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
-@@ -1 +1,90 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# 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
-+VISIBILITY_HIDDEN=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  settings.mk
-+# --- Files --------------------------------------------------------
-+
-+CFLAGS+=-I..
-+
-+.IF "$(OS)"=="WNT"
-+CDEFS+=-DCOMPILED_FROM_DSP
-+.ELSE
-+CDEFS+=-DHAVE_EXPAT_CONFIG_H
-+.ENDIF
-+
-+.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
-+CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
-+.ENDIF # "$(OS)"=="MACOSX"
-+
-+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 -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
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE :  set_wntx64.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :  tg_wntx64.mk
diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch
new file mode 100644
index 0000000..875e41d
--- /dev/null
+++ b/expat/expat-2.1.0.patch
@@ -0,0 +1,94 @@
+--- 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
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2000, 2010 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# 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
++VISIBILITY_HIDDEN=TRUE
++
++# --- Settings -----------------------------------------------------
++.INCLUDE :  settings.mk
++# --- Files --------------------------------------------------------
++
++CFLAGS+=-I..
++
++.IF "$(OS)"=="WNT"
++CDEFS+=-DCOMPILED_FROM_DSP
++.ELSE
++CDEFS+=-DHAVE_EXPAT_CONFIG_H
++.ENDIF
++
++.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
++CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
++.ENDIF # "$(OS)"=="MACOSX"
++
++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 -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
++.ENDIF # "$(BUILD_X64)"!=""
++
++# --- Targets ------------------------------------------------------
++.INCLUDE :  set_wntx64.mk
++.INCLUDE :	target.mk
++.INCLUDE :  tg_wntx64.mk
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
index dfac519..070dafc 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 857468e..7deffd6 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 887a081..9b6aa34 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 408e0ee..4a048af 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

More information about the Libreoffice-commits mailing list