subject:"\[Libreoffice\-commits\] core.git\: download.lst external\/libxml2"

[Libreoffice-commits] core.git: download.lst external/libxml2 external/redland

2023-05-24 Thread Caolán McNamara (via logerrit)

 download.lst  |4 ++--
 external/libxml2/ExternalPackage_libxml2.mk   |2 +-
 external/libxml2/ExternalProject_libxml2.mk   |4 ++--
 external/libxml2/UnpackedTarball_libxml2.mk   |1 +
 external/libxml2/libxml2-XMLCALL-redefine.patch.0 |   11 +++
 external/libxml2/libxml2-icu-sym.patch.0  |2 +-
 external/libxml2/libxml2-icu.patch.0  |2 +-
 external/redland/UnpackedTarball_raptor.mk|1 +
 external/redland/raptor/raptor-libxml2-11.patch.1 |   15 +++
 9 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7
Author: Caolán McNamara 
AuthorDate: Tue May 23 21:15:52 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 15:52:03 2023 +0200

upgrade to libxml2-2.11.4

'checked' field removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55

win32 'run_debug' removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b

add libxml2-XMLCALL-redefine.patch.0 to avoid:
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the 
following warning is treated as an error
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 
'XMLCALL': macro redefinition
UnpackedTarball\expat\lib\expat_external.h(69): note: see previous 
definition of 'XMLCALL'

Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 9615e2dac051..f05ff4539cb5 100644
--- a/download.lst
+++ b/download.lst
@@ -339,9 +339,9 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+LIBXML_SHA256SUM := 
737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
 LIBXML_VERSION_MICRO := 4
-LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_TARBALL := libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index 6338fb20b9df..3c399970cd5b 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.10.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.11.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/ExternalProject_libxml2.mk 
b/external/libxml2/ExternalProject_libxml2.mk
index 979a07728966..7b334fa8ab2a 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_Trace_StartRange,libxml2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
-   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
+   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& nmake \
,win32)
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
$(call 
gb_ExternalProject_get_build_flags,libxml2)" \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-   && $(MAKE) \
+   && $(MAKE) libxml2.la \
)
$(call gb_Trace_EndRange,libxml2,EXTERNAL)
 endif
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 8c81c3d26e4c..d50d52cbeef8 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libxml2))
 $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
+   external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \

[Libreoffice-commits] core.git: download.lst external/libxml2 sc/source test/source unoxml/source

2022-09-14 Thread Michael Stahl (via logerrit)

 download.lst|6 +++---
 external/libxml2/ExternalPackage_libxml2.mk |2 +-
 external/libxml2/libxml2-android.patch  |6 +++---
 sc/source/core/tool/interpr7.cxx|2 ++
 test/source/xmltesttools.cxx|2 ++
 unoxml/source/xpath/xpathobject.cxx |2 ++
 6 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit d621a8839cebf96fe3ac374026f344f8e68bf011
Author: Michael Stahl 
AuthorDate: Wed Sep 14 10:27:02 2022 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 14 21:35:59 2022 +0200

libxml2: upgrade to release 2.10.2

Fixes CVE-2022-2309

Change-Id: I180218be275d3b6d38f8f74aa51c57e50d2734ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139911
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 1bb6fb4b80bd..d87d1608c62b 100644
--- a/download.lst
+++ b/download.lst
@@ -162,9 +162,9 @@ export LIBWEBP_SHA256SUM := 
7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77
 export LIBWEBP_TARBALL := libwebp-1.2.2.tar.gz
 export XMLSEC_SHA256SUM := 
52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262
 export XMLSEC_TARBALL := xmlsec1-1.2.34.tar.gz
-export LIBXML_SHA256SUM := 
60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
-export LIBXML_VERSION_MICRO := 14
-export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.xz
+export LIBXML_SHA256SUM := 
d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
+export LIBXML_VERSION_MICRO := 2
+export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
 export LIBXSLT_SHA256SUM := 
8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
 export LIBXSLT_VERSION_MICRO := 35
 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index d38eb68df0cb..6338fb20b9df 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.10.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/libxml2-android.patch 
b/external/libxml2/libxml2-android.patch
index 42af83274026..acf9b17e02db 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -2,9 +2,9 @@
 +++ misc/build/libxml2-2.7.6/Makefile.in
 @@ -1635,7 +1635,7 @@
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
- check: $(BUILT_SOURCES)
-   $(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
+   $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-recursive
+-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) \
config.h
  install-binPROGRAMS: install-libLTLIBRARIES
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 315afed32284..352c7cf70e45 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -219,6 +219,7 @@ void ScInterpreter::ScFilterXML()
 case XPATH_STRING:
 
PushString(OUString::createFromAscii(reinterpret_cast(pXPathObj->stringval)));
 break;
+#if LIBXML_VERSION < 21000 || defined(LIBXML_XPTR_LOCS_ENABLED)
 case XPATH_POINT:
 PushNoValue();
 break;
@@ -228,6 +229,7 @@ void ScInterpreter::ScFilterXML()
 case XPATH_LOCATIONSET:
 PushNoValue();
 break;
+#endif
 case XPATH_USERS:
 PushNoValue();
 break;
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index ab9e5dcff8b8..07dc1f1f59f2 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -148,9 +148,11 @@ OUString XmlTestTools::getXPathContent(const 
xmlDocUniquePtr& pXmlDoc, const OSt
 xmlXPathFreeObject(pXmlObj);
 return convertedVal;
 }
+#if LIBXML_VERSION < 21000 || defined(LIBXML_XPTR_LOCS_ENABLED)
 case XPATH_POINT:
 case XPATH_RANGE:
 case XPATH_LOCATIONSET:
+#endif
 case XPATH_USERS:
 case XPATH_XSLT_TREE:
 xmlXPathFreeObject(pXmlObj);
diff --git a/unoxml/source/xpath/xpathobject.cxx 
b/unoxml/source/xpath/xpathobject.cxx
index 037a097ae046..c33e6a330f86 100644
--- a/unoxml/source/xpath/xpathobject.cxx
+++ b/unoxml/source/xpath/xpathobject.cxx
@@ -46,12 +46,14 @@ namespace XPath
 return

[Libreoffice-commits] core.git: download.lst external/libxml2

2021-05-21 Thread Michael Stahl (via logerrit)

 download.lst  |4 ++--
 external/libxml2/UnpackedTarball_libxml2.mk   |1 -
 external/libxml2/libxml2-config.patch.1   |4 ++--
 external/libxml2/libxml2-global-symbols.patch |4 ++--
 external/libxml2/ubsan.patch.0|   11 ---
 5 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit bf0c6a98ae38cd2188d7f7e94f1563e5ce6a8ce4
Author: Michael Stahl 
AuthorDate: Fri May 21 13:33:26 2021 +0200
Commit: Michael Stahl 
CommitDate: Fri May 21 15:31:22 2021 +0200

libxml2: upgrade to release 2.9.12

Fixes:
CVE-2021-3516 CVE-2021-3517 CVE-2021-3518 CVE-2021-3537 CVE-2021-3541

* external/libxml2/ubsan.patch.0: remove, fixed upstream

Change-Id: I347dc854b862e78bde87d3e57cf5fdb584ca5673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115913
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 0da12b5b88cf..9dada9f5b5ee 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
 export XMLSEC_TARBALL := xmlsec1-1.2.32.tar.gz
-export LIBXML_SHA256SUM := 
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
-export LIBXML_VERSION_MICRO := 10
+export LIBXML_SHA256SUM := 
c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92
+export LIBXML_VERSION_MICRO := 12
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
 export LIBXSLT_VERSION_MICRO := 34
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 37b5bad97549..83df02849cb3 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
$(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
external/libxml2/libxml2-icu-sym.patch.0, \
external/libxml2/libxml2-icu.patch.0) \
-   external/libxml2/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-config.patch.1 
b/external/libxml2/libxml2-config.patch.1
index 8c28fb6a7806..5a2ef1485e92 100644
--- a/external/libxml2/libxml2-config.patch.1
+++ b/external/libxml2/libxml2-config.patch.1
@@ -18,9 +18,9 @@ Hack the xml2-config to return paths into WORKDIR.
 +exec_prefix=${WORKDIR}/UnpackedTarball/libxml2
 +includedir=${WORKDIR}/UnpackedTarball/libxml2/include
 +libdir=${WORKDIR}/UnpackedTarball/libxml2/.libs
+ cflags=
+ libs=
  
- usage()
- {
 @@ -67,7 +72,8 @@
;;
  
diff --git a/external/libxml2/libxml2-global-symbols.patch 
b/external/libxml2/libxml2-global-symbols.patch
index 49ee73731562..cfec9c530281 100644
--- a/external/libxml2/libxml2-global-symbols.patch
+++ b/external/libxml2/libxml2-global-symbols.patch
@@ -14,8 +14,8 @@
  
  LIBXML2_2.6.32 {
 @@ -2231,3 +2231,43 @@
-   xmlHashDefaultDeallocator;
- } LIBXML2_2.9.1;
+   xmlPopOutputCallbacks;
+ } LIBXML2_2.9.8;
  
 +# HACK: export global variable accessor functions (globals.h)
 +LIBXML2_GLOBAL_VARIABLES {
diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0
deleted file mode 100644
index b52259719673..
--- a/external/libxml2/ubsan.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
 xpath.c
-+++ xpath.c
-@@ -14529,7 +14529,7 @@
-   }
- 
-   stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH,
--  [0]);
-+  namespaces); // i.e., [0] if namespaces != 
NULL
-   if (namespaces != NULL) {
-   xmlFree((xmlChar **)namespaces);
-   }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2019-11-20 Thread Michael Stahl (via logerrit)

 download.lst|4 +-
 external/libxml2/libxml2-android.patch  |2 -
 external/libxml2/libxml2-config.patch.1 |   46 ++--
 3 files changed, 13 insertions(+), 39 deletions(-)

New commits:
commit d1bf39a78ed239d4493f0470ca937852265e79d6
Author: Michael Stahl 
AuthorDate: Wed Nov 20 15:05:02 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Nov 20 18:47:53 2019 +0100

libxml2: upgrade to release 2.9.10

... which is, surprisingly enough, required to build the latest libxslt.

Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94
Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index a7348abf3e4f..df853ad67db0 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
 export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
-export LIBXML_SHA256SUM := 
94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
-export LIBXML_VERSION_MICRO := 9
+export LIBXML_SHA256SUM := 
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+export LIBXML_VERSION_MICRO := 10
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
 export LIBXSLT_VERSION_MICRO := 33
diff --git a/external/libxml2/libxml2-android.patch 
b/external/libxml2/libxml2-android.patch
index 714de61068fb..42af83274026 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -4,7 +4,7 @@
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
  check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) \
config.h
  install-binPROGRAMS: install-libLTLIBRARIES
diff --git a/external/libxml2/libxml2-config.patch.1 
b/external/libxml2/libxml2-config.patch.1
index 7d96fb530e57..8c28fb6a7806 100644
--- a/external/libxml2/libxml2-config.patch.1
+++ b/external/libxml2/libxml2-config.patch.1
@@ -25,45 +25,19 @@ Hack the xml2-config to return paths into WORKDIR.
;;
  
  --cflags)
--  echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-+echo -I${includedir}
-+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+-cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++#cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++cflags="-I${includedir}"
;;
  
  --libtool-libs)
-@@ -82,19 +88,24 @@
-   ;;
+@@ -91,7 +96,8 @@
+ libs="@XML_LIBDIR@ $libs"
+ fi
  
- --libs)
--if [ "`uname`" = "Linux" ]
--  then
--  if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = 
"-L/usr/lib64" ]
--  then
--  echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
--  else
--  echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
--  fi
--  else
--  echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ 
@WIN32_EXTRA_LIBADD@
--  fi
-+echo -L${libdir} -lxml2 -lm
-+#if [ "`uname`" = "Linux" ]
-+# then
-+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = 
"-L/usr/lib64" ]
-+# then
-+# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# fi
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ 
@WIN32_EXTRA_LIBADD@
-+# fi
-   ;;
+-libs="$libs @WIN32_EXTRA_LIBADD@"
++#libs="$libs @WIN32_EXTRA_LIBADD@"
++libs="-L${libdir} -lxml2 -lm"
+ ;;
  
-+print) # ugly configure hack
-+exit 0
-+;;
-+ 
  *)
-   usage
-   exit 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2018-03-06 Thread Michael Stahl

 download.lst |4 ++--
 external/libxml2/libxml2-icu.patch.0 |   13 +++--
 external/libxml2/libxml2-vc10.patch  |2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit f775b5427bf085577feb5badb762156283d76ae5
Author: Michael Stahl 
Date:   Tue Mar 6 14:49:29 2018 +0100

libxml2: upgrade to release 2.9.8

Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3
Reviewed-on: https://gerrit.libreoffice.org/50835
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 641a397c9b15..424c642298c4 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
 export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
-export LIBXML_SHA256SUM := 
f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
-export LIBXML_VERSION_MICRO := 7
+export LIBXML_SHA256SUM := 
0b74e51595654f958148759cfef0993114ddbb6f31aee018f3558e8e2732
+export LIBXML_VERSION_MICRO := 8
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
 export LIBXSLT_VERSION_MICRO := 32
diff --git a/external/libxml2/libxml2-icu.patch.0 
b/external/libxml2/libxml2-icu.patch.0
index 9aaad2de4915..b390b03d8787 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -1,3 +1,5 @@
+Find bundled ICU in workdir and use debug .libs when needed
+
 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 --- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
 +++ win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
@@ -18,15 +20,14 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
  LIBS =
  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
 @@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
- LIBS = $(LIBS) iconv.lib
- !endif 
- !if "$(WITH_ICU)" == "1"
--LIBS = $(LIBS) icu.lib
+ !if "$(STATIC)" == "1"
+ LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
+ !else
 +!if "$(WITH_RUN_DEBUG)" == "1"
 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
 +!else
-+LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
+ LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
 +!endif
  !endif
+ !endif
  !if "$(WITH_ZLIB)" == "1"
- # could be named differently zdll or zlib
diff --git a/external/libxml2/libxml2-vc10.patch 
b/external/libxml2/libxml2-vc10.patch
index f3f2b511f3f2..3892b518d35d 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -3,7 +3,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012
 --- build/libxml2-2.7.6/win32/Makefile.msvc.old2010-09-20 
20:22:41.5 +0200
 +++ build/libxml2-2.7.6/win32/Makefile.msvc2010-09-20 20:23:00.25000 
+0200
 @@ -59,6 +59,7 @@
- CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H"
+ CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
  !endif
  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2017-11-08 Thread David Tardon

 download.lst |4 ++--
 external/libxml2/libxml2-icu.patch.0 |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3ab270242edc9e2ccbe50b2abecf3fec242113d1
Author: David Tardon 
Date:   Tue Nov 7 19:49:20 2017 +0100

upload libxml2 2.9.7

Change-Id: I3f72ec938c87e0c0d30a91b32d96fedf5379207f
Reviewed-on: https://gerrit.libreoffice.org/44423
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 8971ac4bc94a..04e47acc5bea 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
 export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
-export LIBXML_SHA256SUM := 
8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
-export LIBXML_VERSION_MICRO := 6
+export LIBXML_SHA256SUM := 
f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
+export LIBXML_VERSION_MICRO := 7
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
 export LIBXSLT_VERSION_MICRO := 32
diff --git a/external/libxml2/libxml2-icu.patch.0 
b/external/libxml2/libxml2-icu.patch.0
index da05e401c0a9..9aaad2de4915 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -3,7 +3,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 +++ win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
  CC = cl.exe
- CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 
$(CRUNTIME)
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 
$(CRUNTIME)
  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n 
/I$(WORKDIR)/UnpackedTarball/icu/source/common
  !if "$(WITH_THREADS)" != "no"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2017-10-10 Thread David Tardon

 download.lst|5 +++--
 external/libxml2/ExternalPackage_libxml2.mk |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a0439f5a5b8ee8adaeba0bacbef3bf77a7fd05a0
Author: David Tardon 
Date:   Tue Oct 10 10:19:04 2017 +0200

upload libxml2 2.9.6

Change-Id: Iafb9d9e2459451d213cad5d9141755df999d7ced
Reviewed-on: https://gerrit.libreoffice.org/43306
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 1da831ab5a31..ef9cf8e55c4b 100644
--- a/download.lst
+++ b/download.lst
@@ -143,8 +143,9 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
 export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
-export LIBXML_SHA256SUM := 
4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
-export LIBXML_TARBALL := libxml2-2.9.5.tar.gz
+export LIBXML_SHA256SUM := 
8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
+export LIBXML_VERSION_MICRO := 6
+export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
 export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
 export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index c5b43ba31fbe..d38eb68df0cb 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.5))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2016-05-24 Thread Michael Stahl

 download.lst |2 +-
 external/libxml2/ExternalPackage_xml2.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 469aa7fb9e42757267347b986f0e2b1184ebb508
Author: Michael Stahl 
Date:   Tue May 24 17:27:14 2016 +0200

libxml2: upgrade to release 2.9.4

Change-Id: Ia3109b704155b9baa28f2a5f224e55af161f4fa1
Reviewed-on: https://gerrit.libreoffice.org/25412
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index ddd6edc..3d52ffb 100644
--- a/download.lst
+++ b/download.lst
@@ -93,7 +93,7 @@ export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
 export LIBXMLSEC_TARBALL := 
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
-export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
+export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
diff --git a/external/libxml2/ExternalPackage_xml2.mk 
b/external/libxml2/ExternalPackage_xml2.mk
index 3694937..3878b3e 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.3))
+$(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.4))
 endif
 endif # DISABLE_DYNLOADING
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libxml2

2015-11-20 Thread Michael Stahl

 download.lst |2 +-
 external/libxml2/ExternalPackage_xml2.mk |2 +-
 external/libxml2/UnpackedTarball_xml2.mk |2 --
 external/libxml2/libxml2-freebsd.patch.1 |   15 ---
 external/libxml2/libxml2-icu.patch.0 |2 +-
 external/libxml2/libxml2-vc10.patch  |2 ++
 external/libxml2/libxml2-vc15.patch  |   13 -
 7 files changed, 5 insertions(+), 33 deletions(-)

New commits:
commit 391bcf348d585b5e246ec808833af522edd371f2
Author: Michael Stahl 
Date:   Fri Nov 20 13:50:51 2015 +0100

libxml2: upgrade to version 2.9.3

- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same)
- drop libxml2-vc15.patch (fixed upstream)

Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116
Reviewed-on: https://gerrit.libreoffice.org/20084
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 471894e..76f8124 100755
--- a/download.lst
+++ b/download.lst
@@ -89,7 +89,7 @@ export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
+export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
diff --git a/external/libxml2/ExternalPackage_xml2.mk 
b/external/libxml2/ExternalPackage_xml2.mk
index a0bf5eb..3694937 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1))
+$(eval $(call 
gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.3))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/UnpackedTarball_xml2.mk 
b/external/libxml2/UnpackedTarball_xml2.mk
index 66659b0..a683d28 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -13,13 +13,11 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
external/libxml2/libxml2-config.patch.1 \
-   external/libxml2/libxml2-freebsd.patch.1 \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
external/libxml2/ubsan.patch.0 \
-   external/libxml2/libxml2-vc15.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-freebsd.patch.1 
b/external/libxml2/libxml2-freebsd.patch.1
deleted file mode 100644
index a874315..000
--- a/external/libxml2/libxml2-freebsd.patch.1
+++ /dev/null
@@ -1,15 +0,0 @@
-Usual patch to produce Linux-like .so files on FreeBSD
-
 a/ltmain.sh2009-10-06 17:39:54.0 +0100
-+++ b/ltmain.sh2009-12-17 11:43:56.0 +
-@@ -6271,8 +6271,8 @@
- ;;
- 
-   freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.`expr $current - $age`
-+versuffix=".$major.$age.$revision";
- ;;
- 
-   irix | nonstopux)
diff --git a/external/libxml2/libxml2-icu.patch.0 
b/external/libxml2/libxml2-icu.patch.0
index 4db9f9b..da05e40 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -3,7 +3,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 +++ win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
  CC = cl.exe
- CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D 
"NOLIBTOOL" /W1 $(CRUNTIME)
+ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 
$(CRUNTIME)
  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n 
/I$(WORKDIR)/UnpackedTarball/icu/source/common
  !if "$(WITH_THREADS)" != "no"
diff --git a/external/libxml2/libxml2-vc10.patch 
b/external/libxml2/libxml2-vc10.patch
index f88054e..f3f2b51 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -1,3 +1,5 @@
+Add SOLARINC, and disable SSE2 default

[Libreoffice-commits] core.git: download.lst external/libxml2 external/redland

[Libreoffice-commits] core.git: download.lst external/libxml2 sc/source test/source unoxml/source

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

[Libreoffice-commits] core.git: download.lst external/libxml2

9 matches

Site Navigation

Mail list logo

Footer information