update serf to 1.3.9

Its build system has switches to scons, so build the library
using gbuild.

Change-Id: I45b784e65e4987c25baf3fa1477816c744663bf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114107
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

5 files changed, 59 insertions, 87 deletions

diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk
deleted file mode 100644
index 043045654956..000000000000
--- a/external/serf/ExternalProject_serf.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,serf))
-
-$(eval $(call gb_ExternalProject_use_externals,serf,\
-	apr \
-))
-
-$(eval $(call gb_ExternalProject_register_targets,serf,\
-	build \
-))
-
-$(eval $(call gb_ExternalProject_use_nmake,serf,build))
-
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,serf,build):
-	$(call gb_Trace_StartRange,serf,EXTERNAL)
-	$(call gb_ExternalProject_run,build,\
-		APR_SRC="..\apr" \
-		APRUTIL_SRC="..\apr_util" \
-		OPENSSL_SRC="..\openssl" \
-		ZLIB_SRC="..\zlib" \
-		nmake -nologo -f serf.mak \
-			$(if $(MSVC_USE_DEBUG_RUNTIME),DEBUG_BUILD=T Debug,Release)/serf-1.lib \
-	)
-	$(call gb_Trace_EndRange,serf,EXTERNAL)
-
-else
-# serf is using SERF_LIBS variable, so pass it empty
-$(call gb_ExternalProject_get_state_target,serf,build):
-	$(call gb_Trace_StartRange,serf,EXTERNAL)
-	+$(call gb_ExternalProject_run,build,\
-		./configure SERF_LIBS= \
-			--enable-option-checking=fatal \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
-			$(if $(SYSTEM_APR),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \
-			$(if $(SYSTEM_APR),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \
-			$(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
-		&& $(MAKE) libserf-1.la \
-	)
-	$(call gb_Trace_EndRange,serf,EXTERNAL)
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/serf/Module_serf.mk b/external/serf/Module_serf.mk
index 10ec039359a2..263ff05223c5 100644
--- a/external/serf/Module_serf.mk
+++ b/external/serf/Module_serf.mk
@@ -10,8 +10,8 @@
 $(eval $(call gb_Module_Module,serf))
 
 $(eval $(call gb_Module_add_targets,serf,\
+	StaticLibrary_serf \
 	UnpackedTarball_serf \
-	ExternalProject_serf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/serf/StaticLibrary_serf.mk b/external/serf/StaticLibrary_serf.mk
new file mode 100644
index 000000000000..f202ddc1da4b
--- /dev/null
+++ b/external/serf/StaticLibrary_serf.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,serf))
+
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,serf))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,serf,serf))
+
+$(eval $(call gb_StaticLibrary_use_externals,serf,\
+    apr \
+    openssl \
+))
+
+$(eval $(call gb_StaticLibrary_set_include,serf,\
+	-I$(call gb_UnpackedTarball_get_dir,serf) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,serf,\
+    UnpackedTarball/serf/context \
+    UnpackedTarball/serf/incoming \
+    UnpackedTarball/serf/outgoing \
+    UnpackedTarball/serf/ssltunnel \
+    UnpackedTarball/serf/auth/auth_basic \
+    UnpackedTarball/serf/auth/auth \
+    UnpackedTarball/serf/auth/auth_digest \
+    UnpackedTarball/serf/auth/auth_spnego \
+    UnpackedTarball/serf/auth/auth_spnego_gss \
+    UnpackedTarball/serf/auth/auth_spnego_sspi \
+    UnpackedTarball/serf/buckets/aggregate_buckets \
+    UnpackedTarball/serf/buckets/allocator \
+    UnpackedTarball/serf/buckets/barrier_buckets \
+    UnpackedTarball/serf/buckets/buckets \
+    UnpackedTarball/serf/buckets/bwtp_buckets \
+    UnpackedTarball/serf/buckets/deflate_buckets \
+    UnpackedTarball/serf/buckets/dechunk_buckets \
+    UnpackedTarball/serf/buckets/file_buckets \
+    UnpackedTarball/serf/buckets/headers_buckets \
+    UnpackedTarball/serf/buckets/chunk_buckets \
+    UnpackedTarball/serf/buckets/iovec_buckets \
+    UnpackedTarball/serf/buckets/limit_buckets \
+    UnpackedTarball/serf/buckets/mmap_buckets \
+    UnpackedTarball/serf/buckets/request_buckets \
+    UnpackedTarball/serf/buckets/response_body_buckets \
+    UnpackedTarball/serf/buckets/response_buckets \
+    UnpackedTarball/serf/buckets/simple_buckets \
+    UnpackedTarball/serf/buckets/socket_buckets \
+    UnpackedTarball/serf/buckets/ssl_buckets \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/serf/UnpackedTarball_serf.mk b/external/serf/UnpackedTarball_serf.mk
index e6e950920b95..1e9ffa8be22d 100644
--- a/external/serf/UnpackedTarball_serf.mk
+++ b/external/serf/UnpackedTarball_serf.mk
@@ -11,12 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,serf))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,serf,$(SERF_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,serf,\
-	serf.mak \
-))
-
 $(eval $(call gb_UnpackedTarball_add_patches,serf,\
-	external/serf/windows.build.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/serf/windows.build.patch.1 b/external/serf/windows.build.patch.1
deleted file mode 100644
index c659d41cdf43..000000000000
--- a/external/serf/windows.build.patch.1
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur serf.org/serf.mak serf/serf.mak
---- serf.org/serf.mak	2014-03-05 16:31:26.681695709 +0100
-+++ serf/serf.mak	2014-03-05 16:32:20.969696348 +0100
-@@ -93,7 +93,7 @@
- WIN32_DEFS = /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT /D SERF_HAVE_SSPI
- 
- CPP=cl.exe
--CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
-+CPP_PROJ = /c /nologo /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
- LIB32=link.exe
- LIB32_FLAGS=/nologo
- 
-@@ -127,16 +127,6 @@
-     "$(INTDIR)\socket_buckets.obj" \
-     "$(INTDIR)\ssl_buckets.obj" \
- 
--!IFDEF OPENSSL_STATIC
--LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \
--               "$(OPENSSL_SRC)\out32\ssleay32.lib"
--!ELSE
--LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \
--               "$(OPENSSL_SRC)\out32dll\ssleay32.lib"
--!ENDIF
--
--LIB32_OBJS = $(LIB32_OBJS) $(APR_LIBS) $(APRUTIL_LIBS) $(ZLIB_LIBS) 
--
- SYS_LIBS = secur32.lib
- 
- TEST_OBJS = \