[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 7 commits - configure.ac download.lst external/curl external/expat ucb/source vcl/unx
Andras Timar
andras.timar at collabora.com
Thu Jan 5 12:52:27 UTC 2017
configure.ac | 2 -
download.lst | 7 ++--
external/curl/ExternalPackage_curl.mk | 2 -
external/curl/ExternalProject_curl.mk | 2 -
external/curl/UnpackedTarball_curl.mk | 3 --
external/curl/curl-7.26.0_win-proxy.patch | 43 +++++++++++++++---------------
external/curl/curl-freebsd.patch.1 | 32 ----------------------
external/curl/curl-msvc-schannel.patch.1 | 4 +-
external/curl/curl-msvc.patch.1 | 12 ++++++--
external/expat/UnpackedTarball_expat.mk | 2 -
external/expat/expat-2.1.0.patch | 13 ---------
ucb/source/ucp/ftp/ftploaderthread.cxx | 2 -
vcl/unx/gtk/window/gtksalmenu.cxx | 6 +++-
13 files changed, 49 insertions(+), 81 deletions(-)
New commits:
commit 42fc8bbcab276259e8b6b6e6384f0d2af4422b99
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu Jan 5 13:52:03 2017 +0100
Bump version to 4.3-13
Change-Id: Idf56644a6bcbf9f465a8e3d24f96a3455a6c1ca9
diff --git a/configure.ac b/configure.ac
index 3965d8c..5ccac6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[4.3.10.12],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.3.10.13],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 430dce024481f61c0edda943fe7a54d35c1d5f3a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 2 11:48:21 2016 +0100
curl: upgrade to version 7.51.0
- fixes about a dozen CVEs
- tweak curl-7.26.0_win-proxy.patch:
there is a "checksrc" thing now in curl that fails the build with:
warning: use of strtok is banned (BANNEDFUNC)
so use strtok_s instead (which is MSVC's name for standard strtok_r)
- use Makefile.vc12 instead of Makefile.vc10
- remove strequal.obj from Makefile.vc12, it does not actually exist
Change-Id: Ie2da64980d88c72b0c902376ffc01abf97a7bc91
Reviewed-on: https://gerrit.libreoffice.org/30484
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/download.lst b/download.lst
index 72be741..79307d6 100644
--- a/download.lst
+++ b/download.lst
@@ -26,8 +26,8 @@ export COINMP_TARBALL := CoinMP-1.7.6.tgz
export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
export CPPUNIT_TARBALL := ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-export CURL_MD5SUM := 03940d7d4fcea1521fbbf07c1cf16f5e
-export CURL_TARBALL := curl-7.50.0.tar.gz
+export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456
+export CURL_TARBALL := curl-7.51.0.tar.gz
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index b012079..75989ac 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -76,7 +76,7 @@ else ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
- MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
+ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \
cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index fc9d3d2..63055a2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
- lib/Makefile.vc10 \
+ lib/Makefile.vc12 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index 4c5327f..580479a 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
---- curl-7.26.0/lib/Makefile.vc10
-+++ misc/build/curl-7.26.0/lib/Makefile.vc10
+--- curl-7.26.0/lib/Makefile.vc12
++++ misc/build/curl-7.26.0/lib/Makefile.vc12
@@ -118,7 +118,7 @@
WINSSLLIBS = crypt32.lib
ZLIBLIBSDLL = zdll.lib
@@ -13,7 +13,7 @@
+++ misc/build/curl-7.26.0/lib/url.c
@@ -78,6 +78,10 @@
bool curl_win32_idn_to_ascii(const char *in, char **out);
- #endif /* USE_LIBIDN */
+ #endif /* USE_LIBIDN2 */
+#ifdef WIN32
+#include <WinHttp.h>
@@ -52,7 +52,7 @@
#ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4613,7 +4633,63 @@
+@@ -4613,7 +4633,64 @@
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
@@ -83,9 +83,10 @@
+ if(!check_noproxy(conn->host.name, no_proxy)) {
+ /* Look for the http proxy setting */
+ char* tok;
++ char *saveptr;
+
+ if(NULL != ieProxy) {
-+ tok = strtok(ieProxy, ";");
++ tok = strtok_s(ieProxy, ";", &saveptr);
+ if(strchr(tok, '=') == NULL) {
+ proxy = strdup(ieProxy);
+ }
@@ -95,7 +96,7 @@
+ /* We found HTTP proxy value, then use it */
+ proxy = strdup(tok + 5);
+ }
-+ tok = strtok(NULL, ";");
++ tok = strtok_s(NULL, ";", &saveptr);
+ }
+ while(NULL != tok);
+ }
diff --git a/external/curl/curl-msvc-schannel.patch.1 b/external/curl/curl-msvc-schannel.patch.1
index 1091a76..96768aa 100644
--- a/external/curl/curl-msvc-schannel.patch.1
+++ b/external/curl/curl-msvc-schannel.patch.1
@@ -1,7 +1,7 @@
MSVC: use WNT native Schannel SSL/TLS implementation
---- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100
-+++ curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100
+--- curl/lib/Makefile.vc12.old 2013-11-19 00:00:29.044499752 +0100
++++ curl/lib/Makefile.vc12 2013-11-19 00:01:29.135499684 +0100
@@ -260,7 +260,7 @@
TARGET = $(LIBCURL_DYN_LIB_REL)
DIROBJ = $(CFG)
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 927b3f1..88ced0a 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -1,7 +1,7 @@
MSVC: using SOLARINC and EXCFLAGS
---- curl/lib/Makefile.vc10 2012-05-24 12:07:02.000000000 -0400
-+++ curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400
+--- curl/lib/Makefile.vc12 2012-05-24 12:07:02.000000000 -0400
++++ curl/lib/Makefile.vc12 2012-10-29 11:53:44.658809300 -0400
@@ -117,7 +117,7 @@
ZLIBLIBSDLL = zdll.lib
ZLIBLIBS = zlib.lib
@@ -11,6 +11,14 @@ MSVC: using SOLARINC and EXCFLAGS
CFGSET = FALSE
+@@ -632,7 +632,6 @@
+ $(DIROBJ)\vtls.obj \
+ $(DIROBJ)\openssl.obj \
+ $(DIROBJ)\strdup.obj \
+- $(DIROBJ)\strequal.obj \
+ $(DIROBJ)\strerror.obj \
+ $(DIROBJ)\strtok.obj \
+ $(DIROBJ)\strtoofft.obj \
@@ -620,11 +620,11 @@
debug-dll-ssl-dll\libcurl.res \
debug-dll-zlib-dll\libcurl.res \
commit 9874b0011547070051f162c63fa9ede2b465c859
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 29 09:02:58 2016 +0100
bump curl to 7.50.0
Change-Id: I368a18f70dfac51770afeb1f9e84ff83c19f0989
Reviewed-on: https://gerrit.libreoffice.org/27671
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/download.lst b/download.lst
index 6c4c5d3..72be741 100644
--- a/download.lst
+++ b/download.lst
@@ -26,8 +26,8 @@ export COINMP_TARBALL := CoinMP-1.7.6.tgz
export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
export CPPUNIT_TARBALL := ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-export CURL_MD5SUM := 11bddbb452a8b766b932f859aaeeed39
-export CURL_TARBALL := curl-7.43.0.tar.bz2
+export CURL_MD5SUM := 03940d7d4fcea1521fbbf07c1cf16f5e
+export CURL_TARBALL := curl-7.50.0.tar.gz
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 6266912..bb5f06b 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli
else ifeq ($(OS),AIX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
else
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.3.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.4.0))
endif
endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 8e236b4..fc9d3d2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
- external/curl/curl-freebsd.patch.1 \
external/curl/curl-msvc.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index 99402a4..4c5327f 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,18 +1,18 @@
--- curl-7.26.0/lib/Makefile.vc10
+++ misc/build/curl-7.26.0/lib/Makefile.vc10
-@@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE)
- SSLLIBS = libeay32.lib ssleay32.lib
+@@ -118,7 +118,7 @@
+ WINSSLLIBS = crypt32.lib
ZLIBLIBSDLL = zdll.lib
ZLIBLIBS = zlib.lib
-WINLIBS = ws2_32.lib wldap32.lib advapi32.lib
-+WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib
++WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib crypt32.lib
CFLAGS = $(CFLAGS) $(EXCFLAGS)
CFGSET = FALSE
--- curl-7.26.0/lib/url.c
+++ misc/build/curl-7.26.0/lib/url.c
-@@ -80,6 +80,10 @@ void idn_free (void *ptr);
- int curl_win32_idn_to_ascii(const char *in, char **out);
+@@ -78,6 +78,10 @@
+ bool curl_win32_idn_to_ascii(const char *in, char **out);
#endif /* USE_LIBIDN */
+#ifdef WIN32
@@ -22,7 +22,7 @@
#include "urldata.h"
#include "netrc.h"
-@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char* no_proxy)
+@@ -4586,6 +4590,21 @@
return FALSE;
}
@@ -33,9 +33,9 @@
+ char* out = NULL;
+ if(wStr != NULL) {
+ bufSize = WideCharToMultiByte(
-+ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
-+ out = ( char* )malloc( bufSize * sizeof(char));
-+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL);
++ out = (char*)malloc(bufSize * sizeof(char));
++ WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL);
+ }
+ return out;
+}
@@ -44,7 +44,7 @@
/****************************************************************
* Detect what (if any) proxy to use. Remember that this selects a host
* name and is not limited to HTTP proxies only.
-@@ -4119,6 +4138,7 @@ static bool check_noproxy(const char* name, const char* no_proxy)
+@@ -4594,6 +4613,7 @@
static char *detect_proxy(struct connectdata *conn)
{
char *proxy = NULL;
@@ -52,7 +52,7 @@
#ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4613,7 +4633,63 @@
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
@@ -93,7 +93,7 @@
+ do {
+ if(strncmp(tok, "http=", 5) == 0) {
+ /* We found HTTP proxy value, then use it */
-+ proxy = strdup( tok + 5 );
++ proxy = strdup(tok + 5);
+ }
+ tok = strtok(NULL, ";");
+ }
@@ -109,15 +109,15 @@
+ /* TODO Handle the Proxy config Auto Detection case */
+ }
+
-+ GlobalFree( ieProxyConfig->lpszAutoConfigUrl );
-+ GlobalFree( ieProxyConfig->lpszProxy );
-+ GlobalFree( ieProxyConfig->lpszProxyBypass );
++ GlobalFree(ieProxyConfig->lpszAutoConfigUrl);
++ GlobalFree(ieProxyConfig->lpszProxy);
++ GlobalFree(ieProxyConfig->lpszProxyBypass);
+ }
+#else /* !WIN32 */
char proxy_env[128];
no_proxy=curl_getenv("no_proxy");
-@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4663,6 +4739,7 @@
}
} /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified
non-proxy */
diff --git a/external/curl/curl-freebsd.patch.1 b/external/curl/curl-freebsd.patch.1
deleted file mode 100644
index b1d7cb8..0000000
--- a/external/curl/curl-freebsd.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-Usual patch to produce Linux-like .so files on FreeBSD
-
-diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
---- a/ltmain.sh 2012-07-02 13:28:51.298994493 +0200
-+++ b/ltmain.sh 2012-07-02 13:42:46.511039769 +0200
-@@ -7334,13 +7334,13 @@
- #
- case $version_type in
- # correct linux to gnu/linux during the next big refactor
-- darwin|linux|osf|windows|none)
-+ darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
- func_arith $number_major + $number_minor
- current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|qnx|sunos)
-+ qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -7420,8 +7420,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current"
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
commit 65e6d6e02242e539215abf18803fc0b7b91137f8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 12:08:35 2016 +0100
curl 7.50.0 has CURL as typedef struct Curl_easy
Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index e910f0e..03df614 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -79,7 +79,7 @@ FTPLoaderThread::~FTPLoaderThread() {
CURL* FTPLoaderThread::handle() {
- CURL* ret = osl_getThreadKeyData(m_threadKey);
+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
if(!ret) {
ret = curl_easy_init();
if (ret != 0) {
commit 0ad1aec6ac42847deb5c11fdced3891f803a925f
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date: Thu Sep 18 18:33:00 2014 +0800
fdo#69090 Avoid using a string after free
Change-Id: I9020b595e434b4de8aa6a14c20d6c98fa619b96a
Reviewed-on: https://gerrit.libreoffice.org/11502
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 6143e6c..2a85d03 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -657,7 +657,11 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSub
GtkSalMenuItem *pSalItem = maItems[ nPos ];
OUString aItemCommand = mpVCLMenu->GetItemCommand( pSalItem->mnId );
- gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr();
+ // Do not join the following two lines, or the OString will be destroyed
+ // immediately, and the gchar* pointed to by aItemCommandStr will be
+ // freed before it can be used - fdo#69090
+ OString aItemCommandOStr = OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 );
+ gchar* aItemCommandStr = (gchar*) aItemCommandOStr.getStr();
if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 )
{
commit 4c3cc4e4f49fa32b866c935b43d7eb1f9383275c
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jul 8 13:28:10 2016 +0200
tdf#100807 upload expat 2.2.0
Change-Id: Ic059d9cc94d4a5cf016dcf63cf5a8bf9c05d8c8a
Reviewed-on: https://gerrit.libreoffice.org/27037
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/download.lst b/download.lst
index e6eb5c6..6c4c5d3 100644
--- a/download.lst
+++ b/download.lst
@@ -34,7 +34,8 @@ export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a
export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2
-export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
+export EXPAT_MD5SUM := 2f47841c829facb346eb6e3fab5212e2
+export EXPAT_TARBALL := expat-2.2.0.tar.bz2
export FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
# FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
commit b59ed531416ee5cb3d8ee8a33be0a06424d659f6
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 26 14:20:02 2015 +0200
expat: remove duplicate patch
Change-Id: Ie813234b78b9f8d2c61c9640546317d754f66004
diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
index 1ea97b5..60e933d 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat))
$(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,expat,\
- external/expat/expat-2.1.0.patch \
+ external/expat/expat-winapi.patch \
))
# This is a bit hackish.
diff --git a/external/expat/expat-2.1.0.patch b/external/expat/expat-2.1.0.patch
deleted file mode 100644
index 070dafc..0000000
--- a/external/expat/expat-2.1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 */
-
--#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
--#define XML_USE_MSC_EXTENSIONS 1
--#endif
--
- /* Expat tries very hard to make the API boundary very specifically
- defined. There are two macros defined to control this boundary;
- each of these can be defined before including this header to
More information about the Libreoffice-commits
mailing list