external/curl/UnpackedTarball_curl.mk             |    1 
 external/curl/curl-msvc-disable-protocols.patch.1 |   24 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 9fe457b2765113d42139a4043b6ba64d93107585
Author: Michael Stahl <mst...@redhat.com>
Date:   Wed Aug 9 16:52:18 2017 +0200

    curl: disable protocols nobody needs in MSVC build
    
    These are disabled via configure on other platforms.
    
    Change-Id: I4e27865396f3817ceb5645ab8589c21fdaa5afab
    (cherry picked from commit 152a1d279cbc81e7b5f076a2c4b20c12c6929ce6)
    Reviewed-on: https://gerrit.libreoffice.org/40936
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 3e88d5f771f1..c20d41519aea 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
        external/curl/curl-msvc.patch.1 \
+       external/curl/curl-msvc-disable-protocols.patch.1 \
        external/curl/curl-msvc-schannel.patch.1 \
        external/curl/curl-7.26.0_win-proxy.patch \
        external/curl/curl-xp.patch.1 \
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 
b/external/curl/curl-msvc-disable-protocols.patch.1
new file mode 100644
index 000000000000..38ff5ccb5ac0
--- /dev/null
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -0,0 +1,24 @@
+disable protocols nobody needs in MSVC build
+
+--- curl/lib/config-win32.h.orig       2017-08-09 16:43:29.464000000 +0200
++++ curl/lib/config-win32.h    2017-08-09 16:47:38.549200000 +0200
+@@ -733,4 +733,19 @@
+ #  define ENABLE_IPV6 1
+ #endif
+ 
++#define CURL_DISABLE_DICT 1
++#define CURL_DISABLE_FILE 1
++//#undef CURL_DISABLE_FTP
++#define CURL_DISABLE_GOPHER 1
++//#undef CURL_DISABLE_HTTP
++#define CURL_DISABLE_IMAP 1
++#define CURL_DISABLE_LDAP 1
++#define CURL_DISABLE_LDAPS 1
++#define CURL_DISABLE_POP3 1
++#define CURL_DISABLE_RTSP 1
++#define CURL_DISABLE_SMB 1
++#define CURL_DISABLE_SMTP 1
++#define CURL_DISABLE_TELNET 1
++#define CURL_DISABLE_TFTP 1
++
+ #endif /* HEADER_CURL_CONFIG_WIN32_H */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to