Author: jim Date: Thu Aug 3 02:08:16 2017 New Revision: 1803939 URL: http://svn.apache.org/viewvc?rev=1803939&view=rev Log: Expat is now at v 2.2.3
Added: openoffice/trunk/main/expat/expat-2.2.3.patch - copied, changed from r1803862, openoffice/trunk/main/expat/expat-2.2.1.patch Removed: openoffice/trunk/main/expat/expat-2.2.1.patch Modified: openoffice/trunk/main/expat/expat-winapi.patch openoffice/trunk/main/expat/makefile.mk openoffice/trunk/main/expat/prj/d.lst openoffice/trunk/main/external_deps.lst Copied: openoffice/trunk/main/expat/expat-2.2.3.patch (from r1803862, openoffice/trunk/main/expat/expat-2.2.1.patch) URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/expat-2.2.3.patch?p2=openoffice/trunk/main/expat/expat-2.2.3.patch&p1=openoffice/trunk/main/expat/expat-2.2.1.patch&r1=1803862&r2=1803939&rev=1803939&view=diff ============================================================================== --- openoffice/trunk/main/expat/expat-2.2.1.patch (original) +++ openoffice/trunk/main/expat/expat-2.2.3.patch Thu Aug 3 02:08:16 2017 @@ -1,5 +1,5 @@ ---- misc/expat-2.2.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 -+++ misc/build/expat-2.2.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 +--- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008 ++++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008 @@ -1 +1,83 @@ -dummy +#************************************************************** @@ -85,51 +85,3 @@ +.INCLUDE : set_wntx64.mk +.INCLUDE : target.mk +.INCLUDE : tg_wntx64.mk ---- misc/expat-2.2.1/lib/siphash.h Sat Jun 17 09:07:38 2017 -+++ misc/build/expat-2.2.1/lib/siphash.h Fri Jun 30 15:45:22 2017 -@@ -76,7 +76,13 @@ - #define SIPHASH_H - - #include <stddef.h> /* size_t */ -+#if defined(_MSC_VER) && _MSC_VER < 1600 -+typedef unsigned __int64 uint64_t; -+typedef unsigned __int32 uint32_t; -+typedef unsigned __int8 uint8_t; -+#else - #include <stdint.h> /* uint64_t uint32_t uint8_t */ -+#endif - - - #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b)))) ---- misc/expat-2.2.1/configure.ac -+++ misc/build/expat-2.2.1/configure.ac -@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - - - AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) --AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { ---- misc/expat-2.2.1/configure 2017-07-12 17:04:34.000000000 +0200 -+++ misc/build/expat-2.2.1/configure 2017-07-12 17:05:59.000000000 +0200 -@@ -16341,7 +16341,7 @@ - } - - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO"; then : - - - $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h -@@ -16386,7 +16386,8 @@ - conftest$ac_exeext conftest.$ac_ext - - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - - for ac_header in fcntl.h unistd.h Modified: openoffice/trunk/main/expat/expat-winapi.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/expat-winapi.patch?rev=1803939&r1=1803938&r2=1803939&view=diff ============================================================================== --- openoffice/trunk/main/expat/expat-winapi.patch (original) +++ openoffice/trunk/main/expat/expat-winapi.patch Thu Aug 3 02:08:16 2017 @@ -1,6 +1,6 @@ -diff -ur misc/expat-2.2.1/lib/expat_external.h misc/build/expat-2.2.0/lib/expat_external.h ---- misc/expat-2.2.1/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700 -+++ misc/build/expat-2.2.1/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700 +diff -ur misc/expat-2.2.3/lib/expat_external.h misc/build/expat-2.2.3/lib/expat_external.h +--- misc/expat-2.2.3/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700 ++++ misc/build/expat-2.2.3/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700 @@ -7,10 +7,6 @@ /* External API definitions */ Modified: openoffice/trunk/main/expat/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/makefile.mk?rev=1803939&r1=1803938&r2=1803939&view=diff ============================================================================== --- openoffice/trunk/main/expat/makefile.mk (original) +++ openoffice/trunk/main/expat/makefile.mk Thu Aug 3 02:08:16 2017 @@ -38,8 +38,8 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=expat-2.2.1 -TARFILE_MD5=d9c3baeab58774cefc2f04faf29f2cf8 +TARFILE_NAME=expat-2.2.3 +TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334 ADDITIONAL_FILES=lib$/makefile.mk PATCH_FILES=$(TARFILE_NAME).patch \ expat-winapi.patch Modified: openoffice/trunk/main/expat/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/prj/d.lst?rev=1803939&r1=1803938&r2=1803939&view=diff ============================================================================== --- openoffice/trunk/main/expat/prj/d.lst (original) +++ openoffice/trunk/main/expat/prj/d.lst Thu Aug 3 02:08:16 2017 @@ -1,7 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\external\expat mkdir: %_DEST%\lib%_EXT%\x64 -..\%__SRC%\misc\build\expat-2.2.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h -..\%__SRC%\misc\build\expat-2.2.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h +..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h +..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib Modified: openoffice/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1803939&r1=1803938&r2=1803939&view=diff ============================================================================== --- openoffice/trunk/main/external_deps.lst (original) +++ openoffice/trunk/main/external_deps.lst Thu Aug 3 02:08:16 2017 @@ -218,9 +218,9 @@ if (SYSTEM_VIGRA != YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_EXPAT != YES) - MD5 = d9c3baeab58774cefc2f04faf29f2cf8 - name = expat-2.2.1.tar.bz2 - URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.1/expat-2.2.1.tar.bz2 + MD5 = f053af63ef5f39bd9b78d01fbc203334 + name = expat-2.2.3.tar.bz2 + URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2 URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_CURL != YES)