[Libreoffice-commits] core.git: Branch 'aoo/trunk' - curl/curl-7.50.1_win.patch curl/makefile.mk curl/prj external_deps.lst

[Libreoffice Gerrit user]

 curl/curl-7.50.1_win.patch |   35 -----------------------------------
 curl/makefile.mk           |   29 +++++++++--------------------
 curl/prj/d.lst             |    3 +--
 external_deps.lst          |    4 ++--
 4 files changed, 12 insertions(+), 59 deletions(-)

New commits:
commit 0e84cb870bf475fbded9decde12d577d45bdbd51
Author:     Don Lewis <truckman at apache.org>
AuthorDate: Sat Sep 1 19:37:14 2018 +0000
Commit:     Don Lewis <truckman at apache.org>
CommitDate: Sat Sep 1 19:37:14 2018 +0000

    Upgrade the bundled version of curl from 7.50.1 to 7.61.0.

diff --git a/curl/curl-7.50.1_win.patch b/curl/curl-7.50.1_win.patch
deleted file mode 100644
index bfad357d718e..000000000000
--- a/curl/curl-7.50.1_win.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur misc/curl-7.50.1/winbuild/Makefile.msvc.names misc/build/curl-7.50.1/winbuild/Makefile.msvc.names
---- misc/curl-7.50.1/winbuild/Makefile.msvc.names	2016-03-22 00:15:38.000000000 -0700
-+++ misc/build/curl-7.50.1/winbuild/Makefile.msvc.names	2016-07-19 15:35:28.465823000 -0700
-@@ -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
- 
- # --------------------------------------
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 0dcef1d53d15..8b59c83a2e78 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -37,21 +37,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=curl-7.50.1
-TARFILE_MD5=c264788f2e4313a05140d712c1ec90c2
+TARFILE_NAME=curl-7.61.0
+TARFILE_MD5=ef343f64daab4691f528697b58a2d984
 PATCH_FILES=
 
-.IF "$(GUI)"=="WNT"
-    PATCH_FILES+=curl-7.50.1_win.patch
-#	.IF "$(COM)"=="GCC"
-#		PATCH_FILES+=curl-7.19.7_mingw.patch
-#	.ENDIF
-.ENDIF
-
-
-#CONVERTFILES= \
-    lib$/Makefile.vc6
-
 #ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
 
 .IF "$(GUI)"=="UNX"
@@ -113,15 +102,15 @@ curl_MACHINE:="X86"
 curl_MACHINE:="X64"
 .ENDIF
 
-BUILD_DIR=.$/lib
+BUILD_DIR=.$/winbuild
 .IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
 .ELSE
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 DEBUG=yes EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
 .ENDIF
 
-OUT2BIN=$(BUILD_DIR)$/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/libcurl.lib
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
 
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
@@ -150,8 +139,8 @@ OUT2INC= \
     include$/curl$/typecheck-gcc.h  	\
     include$/curl$/stdcheaders.h  	\
     include$/curl$/mprintf.h	    \
-    include$/curl$/curlbuild.h		\
-    include$/curl$/curlrules.h
+    include$/curl$/system.h
+
 
 # --- Targets ------------------------------------------------------
 
diff --git a/curl/prj/d.lst b/curl/prj/d.lst
index 0cf67ad68757..075b31290ce5 100644
--- a/curl/prj/d.lst
+++ b/curl/prj/d.lst
@@ -6,8 +6,7 @@ mkdir: %_DEST%\inc%_EXT%\external\curl
 ..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h
 ..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h
 ..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc%_EXT%\external\curl\typecheck-gcc.h
-..\%__SRC%\inc\curlbuild.h %_DEST%\inc%_EXT%\external\curl\curlbuild.h
-..\%__SRC%\inc\curlrules.h %_DEST%\inc%_EXT%\external\curl\curlrules.h
+..\%__SRC%\inc\system.h %_DEST%\inc%_EXT%\external\curl\system.h
 
 ..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.*
diff --git a/external_deps.lst b/external_deps.lst
index 441cc11209de..8f75b3b9dfd7 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -224,8 +224,8 @@ if (SYSTEM_EXPAT != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_CURL != YES)
-    MD5 = c264788f2e4313a05140d712c1ec90c2
-    name = curl-7.50.1.tar.gz
+    MD5 = ef343f64daab4691f528697b58a2d984
+    name = curl-7.61.0.tar.gz
     URL1 = https://curl.haxx.se/download/$(name)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)