summaryrefslogtreecommitdiff
path: root/external/curl/curl-7.26.0_win.patch
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-11 14:42:13 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-18 14:27:40 -0600
commit88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11 (patch)
tree320c7d09ddf863a23b49aeef455372f15fb41159 /external/curl/curl-7.26.0_win.patch
parent6a826ddc4ee40a9727131cd4b13365bf6ae16319 (diff)
curl: upgrade to version 7.33.0
- from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/curl/curl-7.26.0_win.patch')
-rw-r--r--external/curl/curl-7.26.0_win.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/external/curl/curl-7.26.0_win.patch b/external/curl/curl-7.26.0_win.patch
deleted file mode 100644
index 0b3eed2d2eb6..000000000000
--- a/external/curl/curl-7.26.0_win.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600
-+++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600
-@@ -43,7 +43,7 @@
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
--LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
-+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
-@@ -51,7 +51,7 @@
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
--LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
-+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
- !ENDIF
-
- # --------------------------------------------
-@@ -59,11 +59,11 @@
- # --------------------------------------------
-
- !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
--LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
-+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
--LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
-+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
- !ENDIF
-
- # --------------------------------------
---- curl/lib/Makefile.vc9 2012-05-24 12:07:02.000000000 -0400
-+++ curl/lib/Makefile.vc9 2012-10-29 11:53:44.658809300 -0400
-@@ -117,7 +117,7 @@
- ZLIBLIBSDLL= zdll.lib
- ZLIBLIBS = zlib.lib
- WINLIBS = ws2_32.lib wldap32.lib
--CFLAGS = $(CFLAGS)
-+CFLAGS = $(CFLAGS) $(EXCFLAGS)
-
- CFGSET = FALSE
-
-@@ -620,11 +620,11 @@
- debug-dll-ssl-dll\libcurl.res \
- debug-dll-zlib-dll\libcurl.res \
- debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
-- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc
-+ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc
-
- release-dll\libcurl.res \
- release-dll-ssl-dll\libcurl.res \
- release-dll-zlib-dll\libcurl.res \
- release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
-- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
-+ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
- !ENDIF # End of case where a config was provided.