[Libreoffice-commits] .: curl/curl-7.19.7_mingw.patch curl/curl-7.19.7_win.patch curl/curl-7.26.0_mingw.patch curl/curl-7.26.0_win.patch curl/makefile.mk

[Fridrich Strba]

 curl/curl-7.19.7_mingw.patch |   24 ------------------------
 curl/curl-7.19.7_win.patch   |   19 -------------------
 curl/curl-7.26.0_mingw.patch |   24 ++++++++++++++++++++++++
 curl/curl-7.26.0_win.patch   |   34 ++++++++++++++++++++++++++++++++++
 curl/makefile.mk             |    4 ++--
 5 files changed, 60 insertions(+), 45 deletions(-)

New commits:
commit 4e06bafe801223de132ca043a3f2e0baaf803ed4
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Mon Jul 2 07:26:07 2012 -0600

    Try to fix Windows build of curl
    
    Change-Id: Ifd760cf91ef6c9afe10a110e9b8db2dcc53fd3c8

diff --git a/curl/curl-7.19.7_mingw.patch b/curl/curl-7.19.7_mingw.patch
deleted file mode 100644
index b0fa673..0000000
--- a/curl/curl-7.19.7_mingw.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- misc/curl-7.19.7/lib/setup.h	2009-10-29 05:21:58.000000000 +0900
-+++ misc/build/curl-7.19.7/lib/setup.h	2010-03-02 06:03:10.009500000 +0900
-@@ -40,6 +40,21 @@
- 
- #include "curl_config.h"
- 
-+#ifdef __MINGW32__
-+#undef HAVE_DLFCN_H
-+#define HAVE_GETHOSTBYADDR 1
-+#define HAVE_GETHOSTBYNAME 1
-+#undef HAVE_LIBZ
-+#undef HAVE_NETDB_H
-+#undef HAVE_POLL_H
-+#undef HAVE_SYS_IOCTL_H
-+#undef HAVE_SYS_POLL_H
-+#undef HAVE_SYS_UIO_H
-+#undef HAVE_TERMIOS_H
-+#undef HAVE_TERMIO_H
-+#undef HAVE_ZLIB_H
-+#endif
-+
- #else /* HAVE_CONFIG_H */
- 
- #ifdef _WIN32_WCE
diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch
deleted file mode 100644
index bc59433..0000000
--- a/curl/curl-7.19.7_win.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- misc/curl-7.19.7/lib/Makefile.vc9	2009-11-04 13:35:39.000000000 +0100
-+++ misc/build/curl-7.19.7/lib/Makefile.vc9	2009-11-18 12:32:57.234375000 +0100
-@@ -46,13 +46,13 @@
- # Stem for static libs and DLLs
- #
- LIB_NAME       = libcurl
--LIB_NAME_DEBUG = libcurld
-+LIB_NAME_DEBUG = libcurl
- 
- #
- # Stem for DLL import libs
- #
--IMPLIB_NAME       = libcurl_imp
--IMPLIB_NAME_DEBUG = libcurld_imp
-+IMPLIB_NAME       = libcurl
-+IMPLIB_NAME_DEBUG = libcurl
- 
- !IFNDEF OPENSSL_PATH
- OPENSSL_PATH   = ../../openssl-0.9.8g
diff --git a/curl/curl-7.26.0_mingw.patch b/curl/curl-7.26.0_mingw.patch
new file mode 100644
index 0000000..54d1ef3
--- /dev/null
+++ b/curl/curl-7.26.0_mingw.patch
@@ -0,0 +1,24 @@
+--- misc/curl-7.26.0/lib/setup.h	2009-10-29 05:21:58.000000000 +0900
++++ misc/build/curl-7.26.0/lib/setup.h	2010-03-02 06:03:10.009500000 +0900
+@@ -40,6 +40,21 @@
+ 
+ #include "curl_config.h"
+ 
++#ifdef __MINGW32__
++#undef HAVE_DLFCN_H
++#define HAVE_GETHOSTBYADDR 1
++#define HAVE_GETHOSTBYNAME 1
++#undef HAVE_LIBZ
++#undef HAVE_NETDB_H
++#undef HAVE_POLL_H
++#undef HAVE_SYS_IOCTL_H
++#undef HAVE_SYS_POLL_H
++#undef HAVE_SYS_UIO_H
++#undef HAVE_TERMIOS_H
++#undef HAVE_TERMIO_H
++#undef HAVE_ZLIB_H
++#endif
++
+ #else /* HAVE_CONFIG_H */
+ 
+ #ifdef _WIN32_WCE
diff --git a/curl/curl-7.26.0_win.patch b/curl/curl-7.26.0_win.patch
new file mode 100644
index 0000000..214b5a9
--- /dev/null
+++ b/curl/curl-7.26.0_win.patch
@@ -0,0 +1,34 @@
+--- misc/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
+ 
+ # --------------------------------------
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 3a09209..aab5be3 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -48,9 +48,9 @@ PATCH_FILES=\
     curl-aix.patch
 
 .IF "$(GUI)"=="WNT"
-    PATCH_FILES+=curl-7.19.7_win.patch
+    PATCH_FILES+=curl-7.26.0_win.patch
     .IF "$(COM)"=="GCC"
-        PATCH_FILES+=curl-7.19.7_mingw.patch
+        PATCH_FILES+=curl-7.26.0_mingw.patch
     .ENDIF
 .ENDIF