neon: convert to gbuild

Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432

Makefile.top

@@ -100,6 +100,7 @@ lingucomponent\
 linguistic\
 lotuswordpro\
 mdds\
+neon\
 nlpsolver\
 np_sdk\
 o3tl\
@@ -229,7 +230,6 @@ moz\
 mysqlc\
 mysqlcppconn\
 mythes\
-neon\
 nss\
 odk\
 openldap\

Module_tail_build.mk

@@ -89,6 +89,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     MathMLDTD \
 	mdds \
     Mesa \
+	$(if $(filter NEON,$(BUILD_TYPE)),\
+		neon \
+	) \
 	$(if $(filter NLPSOLVER,$(BUILD_TYPE)),\
 		nlpsolver \
 	) \

RepositoryExternal.mk

@@ -580,14 +580,9 @@ endif # ENABLE_LIBLANGTAG
 ifeq ($(SYSTEM_NEON),YES)
 
 define gb_LinkTarget__use_neon
-ifeq ($(NEON_VERSION),)
-NEON_VERSION=0295
-endif
-
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DNEON_VERSION=0x$(NEON_VERSION) \
 )
-
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 	$(NEON_CFLAGS) \
@@ -599,16 +594,15 @@ endef
 
 else # !SYSTEM_NEON
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
 	neon \
 ))
 
 define gb_LinkTarget__use_neon
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(OUTDIR)/inc/external/neon \
+	-I$(call gb_UnpackedTarball_get_dir,neon/src) \
 	$$(INCLUDE) \
 )
-
 $(call gb_LinkTarget_use_libraries,$(1),\
 	neon \
 )

RepositoryModule_ooo.mk

@@ -97,6 +97,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     MathMLDTD \
 	mdds \
     Mesa \
+	neon \
     nlpsolver \
     np_sdk \
     o3tl \

config_host.mk.in

@@ -406,6 +406,7 @@ export MYTHES_CFLAGS=@MYTHES_CFLAGS@
 export MYTHES_LIBS=@MYTHES_LIBS@
 export NEON_CFLAGS=@NEON_CFLAGS@
 export NEON_LIBS=@NEON_LIBS@
+export NEON_TARBALL=@NEON_TARBALL@
 export NEON_VERSION=@NEON_VERSION@
 export NM=@NM@
 export nodep=@nodep@

configure.in

@@ -8606,7 +8606,6 @@ if test "$with_system_neon" = "yes"; then
     AC_MSG_RESULT([external])
     PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
     NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-    NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
     SYSTEM_NEON=YES
     libo_MINGW_CHECK_DLL([NEON], [libneon])
     libo_MINGW_TRY_DLL([TASN1], [libtasn1])
@@ -8614,14 +8613,15 @@ if test "$with_system_neon" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_NEON=NO
-    NEON_LIBS=-lneon
-    NEON_CFLAGS=
     BUILD_TYPE="$BUILD_TYPE NEON"
+    NEON_TARBALL=ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
+    NEON_VERSION=0295
 fi
 AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_VERSION)
 AC_SUBST(NEON_LIBS)
 AC_SUBST(NEON_CFLAGS)
+AC_SUBST(NEON_TARBALL)
+AC_SUBST(NEON_VERSION)
 AC_SUBST([MINGW_GNUTLS_DLL])
 AC_SUBST([MINGW_NEON_DLL])
 AC_SUBST([MINGW_TASN1_DLL])

neon/Library_neon.mk

+# -*- 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_Library_Library,neon))
+
+$(eval $(call gb_Library_use_unpacked,neon,neon))
+
+$(eval $(call gb_Library_use_externals,neon,\
+	libxml2 \
+	openssl \
+	zlib \
+))
+
+$(eval $(call gb_Library_set_visibility_default,neon))
+
+$(eval $(call gb_Library_set_warnings_not_errors,neon))
+
+$(eval $(call gb_Library_add_generated_cobjects,neon,\
+	UnpackedTarball/neon/src/ne_207 \
+	UnpackedTarball/neon/src/ne_acl3744 \
+	UnpackedTarball/neon/src/ne_alloc \
+	UnpackedTarball/neon/src/ne_auth \
+	UnpackedTarball/neon/src/ne_basic \
+	UnpackedTarball/neon/src/ne_compress \
+	UnpackedTarball/neon/src/ne_dates \
+	UnpackedTarball/neon/src/ne_i18n \
+	UnpackedTarball/neon/src/ne_locks \
+	UnpackedTarball/neon/src/ne_md5 \
+	UnpackedTarball/neon/src/ne_props \
+	UnpackedTarball/neon/src/ne_redirect \
+	UnpackedTarball/neon/src/ne_request \
+	UnpackedTarball/neon/src/ne_session \
+	UnpackedTarball/neon/src/ne_socket \
+	UnpackedTarball/neon/src/ne_socks \
+	UnpackedTarball/neon/src/ne_string \
+	UnpackedTarball/neon/src/ne_uri \
+	UnpackedTarball/neon/src/ne_utils \
+	UnpackedTarball/neon/src/ne_xml \
+	UnpackedTarball/neon/src/ne_xmlreq \
+	UnpackedTarball/neon/src/ne_openssl \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_libraries,neon,\
+	ws2_32 \
+))
+
+$(eval $(call gb_Library_add_generated_cobjects,neon,\
+	UnpackedTarball/neon/src/ne_sspi \
+))
+
+else
+$(eval $(call gb_Library_add_generated_cobjects,neon,\
+	UnpackedTarball/neon/src/ne_ntlm \
+))
+
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_use_libraries,neon,\
+	dl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

neon/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

neon/Module_neon.mk

+# -*- 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_Module_Module,neon))
+
+ifeq ($(SYSTEM_NEON),NO)
+
+$(eval $(call gb_Module_add_targets,neon,\
+	Library_neon \
+	UnpackedTarball_neon \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

neon/UnpackedTarball_neon.mk

+# -*- 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_UnpackedTarball_UnpackedTarball,neon))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,neon,$(NEON_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_files,neon,src,\
+	neon/configs/config.h \
+))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,neon,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,neon,\
+	neon/neon.patch \
+	neon/neon_ne_set_request_flag.patch \
+))
+
+# vim: set noet sw=4 ts=4:

neon/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_neon
-TARGET=so_neon
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_NEON)" == "YES"
-@all:
-    @echo "Using system neon...."
-.ENDIF
-
-.IF "$(DISABLE_NEON)" == "TRUE"
-@all:
-    @echo "neon disabled...."
-.ENDIF
-
-NEON_NAME=neon-0.29.5
-
-TARFILE_NAME=$(NEON_NAME)
-TARFILE_MD5=ff369e69ef0f0143beb5626164e87ae2
-PATCH_FILES=neon.patch neon_ne_set_request_flag.patch
-
-.IF "$(GUI)"=="WNT"
-    PATCH_FILES+=neon_exports_win.patch
-.ELSE
-    PATCH_FILES+=neon_exports_unix.patch
-.ENDIF
-
-ADDITIONAL_FILES=src$/makefile.mk src$/config.h
-
-BUILD_DIR=src
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC= \
-    $(BUILD_DIR)$/ne_207.h \
-    $(BUILD_DIR)$/ne_alloc.h \
-    $(BUILD_DIR)$/ne_auth.h \
-    $(BUILD_DIR)$/ne_basic.h \
-    $(BUILD_DIR)$/ne_compress.h \
-    $(BUILD_DIR)$/ne_defs.h \
-    $(BUILD_DIR)$/ne_locks.h \
-    $(BUILD_DIR)$/ne_props.h \
-    $(BUILD_DIR)$/ne_redirect.h \
-    $(BUILD_DIR)$/ne_request.h \
-    $(BUILD_DIR)$/ne_session.h \
-    $(BUILD_DIR)$/ne_socket.h \
-    $(BUILD_DIR)$/ne_ssl.h \
-    $(BUILD_DIR)$/ne_string.h \
-    $(BUILD_DIR)$/ne_uri.h \
-    $(BUILD_DIR)$/ne_utils.h \
-    $(BUILD_DIR)$/ne_xml.h \
-    $(BUILD_DIR)$/ne_xmlreq.h
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-

neon/neon_exports_unix.patch

---- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
-@@ -0,0 +1,288 @@
-+UDK_3_0_0 {
-+	global:
-+		ne__negotiate_ssl;
-+		ne__ssl_exit;
-+		ne__ssl_init;
-+		ne_ssl_cert_cmp;
-+		ne_ssl_cert_digest;
-+		ne_ssl_cert_export;
-+		ne_ssl_cert_free;
-+		ne_ssl_cert_identity;
-+		ne_ssl_cert_import;
-+		ne_ssl_cert_issuer;
-+		ne_ssl_cert_read;
-+		ne_ssl_cert_signedby;
-+		ne_ssl_cert_subject;
-+		ne_ssl_cert_validity_time;
-+		ne_ssl_cert_write;
-+		ne_ssl_clicert_decrypt;
-+		ne_ssl_clicert_encrypted;
-+		ne_ssl_clicert_free;
-+		ne_ssl_clicert_name;
-+		ne_ssl_clicert_owner;
-+		ne_ssl_clicert_read;
-+		ne_ssl_context_create;
-+		ne_ssl_context_destroy;
-+		ne_ssl_context_keypair;
-+		ne_ssl_context_set_flag;
-+		ne_ssl_context_set_verify;
-+		ne_ssl_context_trustcert;
-+		ne_ssl_dname_cmp;
-+		ne_ssl_readable_dname;
-+		ne_ssl_set_clicert;
-+		ne_ssl_trust_default_ca;
-+		ne_xml_dispatch_request;
-+		ne_xml_parse_response;
-+		ne_xml_create;
-+		ne_xml_currentline;
-+		ne_xml_destroy;
-+		ne_xml_doc_encoding;
-+		ne_xml_failed;
-+		ne_xml_get_attr;
-+		ne_xml_get_error;
-+		ne_xml_mapid;
-+		ne_xml_parse;
-+		ne_xml_parse_v;
-+		ne_xml_push_handler;
-+		ne_xml_resolve_nspace;
-+		ne_xml_set_error;
-+		ne_debug;
-+		ne_debug_init;
-+		ne_debug_mask;
-+		ne_debug_stream;
-+		ne_has_support;
-+		ne_parse_statusline;
-+		ne_version_match;
-+		ne_version_string;
-+		ne_path_childof;
-+		ne_path_compare;
-+		ne_path_escape;
-+		ne_path_has_trailing_slash;
-+		ne_path_parent;
-+		ne_path_unescape;
-+		ne_uri_cmp;
-+		ne_uri_copy;
-+		ne_uri_defaultport;
-+		ne_uri_free;
-+		ne_uri_parse;
-+		ne_uri_resolve;
-+		ne_uri_unparse;
-+		ne_base64;
-+		ne_buffer_altered;
-+		ne_buffer_append;
-+		ne_buffer_clear;
-+		ne_buffer_concat;
-+		ne_buffer_create;
-+		ne_buffer_destroy;
-+		ne_buffer_finish;
-+		ne_buffer_grow;
-+		ne_buffer_ncreate;
-+		ne_buffer_snprintf;
-+		ne_buffer_zappend;
-+		ne_concat;
-+		ne_qtoken;
-+		ne_shave;
-+		ne_snprintf;
-+		ne_strcasecmp;
-+		ne_strclean;
-+		ne_strerror;
-+		ne_strncasecmp;
-+		ne_token;
-+		ne_tolower_array;
-+		ne_unbase64;
-+		ne_vsnprintf;
-+		ne__sock_sslsock;
-+		ne_addr_destroy;
-+		ne_addr_error;
-+		ne_addr_first;
-+		ne_addr_next;
-+		ne_addr_resolve;
-+		ne_addr_result;
-+		ne_iaddr_cmp;
-+		ne_iaddr_free;
-+		ne_iaddr_make;
-+		ne_iaddr_print;
-+		ne_iaddr_reverse;
-+		ne_iaddr_typeof;
-+		ne_sock_accept;
-+		ne_sock_accept_ssl;
-+		ne_sock_block;
-+		ne_sock_cipher;
-+		ne_sock_close;
-+		ne_sock_connect;
-+		ne_sock_connect_ssl;
-+		ne_sock_connect_timeout;
-+		ne_sock_create;
-+		ne_sock_error;
-+		ne_sock_exit;
-+		ne_sock_fd;
-+		ne_sock_fullread;
-+		ne_sock_fullwrite;
-+		ne_sock_init;
-+		ne_sock_peek;
-+		ne_sock_peer;
-+		ne_sock_prebind;
-+		ne_sock_proxy;
-+		ne_sock_read;
-+		ne_sock_read_timeout;
-+		ne_sock_readline;
-+		ne_sock_sessid;
-+		ne__ssl_set_verify_err;
-+		ne_close_connection;
-+		ne_fill_proxy_uri;
-+		ne_fill_server_uri;
-+		ne_get_error;
-+		ne_get_scheme;
-+		ne_get_server_hostport;
-+		ne_get_session_flag;
-+		ne_hook_close_conn;
-+		ne_hook_create_request;
-+		ne_hook_destroy_request;
-+		ne_hook_destroy_session;
-+		ne_hook_post_headers;
-+		ne_hook_post_send;
-+		ne_hook_pre_send;
-+		ne_session_create;
-+		ne_session_destroy;
-+		ne_session_proxy;
-+		ne_set_addrlist;
-+		ne_set_connect_timeout;
-+		ne_set_error;
-+		ne_set_localaddr;
-+		ne_set_notifier;
-+		ne_set_progress;
-+		ne_set_read_timeout;
-+		ne_set_session_flag;
-+		ne_set_session_private;
-+		ne_set_useragent;
-+		ne_ssl_cert_validity;
-+		ne_ssl_provide_clicert;
-+		ne_ssl_set_verify;
-+		ne_ssl_trust_cert;
-+		ne_unhook_close_conn;
-+		ne_unhook_create_request;
-+		ne_unhook_destroy_request;
-+		ne_unhook_destroy_session;
-+		ne_unhook_post_headers;
-+		ne_unhook_post_send;
-+		ne_unhook_pre_send;
-+		ne_version_pre_http11;
-+		ne_accept_2xx;
-+		ne_accept_always;
-+		ne_add_request_header;
-+		ne_add_response_body_reader;
-+		ne_begin_request;
-+		ne_discard_response;
-+		ne_end_request;
-+		ne_get_request_flag;
-+		ne_get_request_private;
-+		ne_get_response_header;
-+		ne_get_session;
-+		ne_get_session_private;
-+		ne_get_status;
-+		ne_print_request_header;
-+		ne_read_response_block;
-+		ne_read_response_to_fd;
-+		ne_request_create;
-+		ne_request_destroy;
-+		ne_request_dispatch;
-+		ne_response_header_iterate;
-+		ne_set_request_body_buffer;
-+		ne_set_request_body_fd;
-+		ne_set_request_body_provider;
-+		ne_set_request_flag;
-+		ne_set_request_private;
-+		ne_redirect_location;
-+		ne_redirect_register;
-+		ne_propfind_allprop;
-+		ne_propfind_create;
-+		ne_propfind_current_private;
-+		ne_propfind_destroy;
-+		ne_propfind_get_parser;
-+		ne_propfind_get_request;
-+		ne_propfind_named;
-+		ne_propfind_set_private;
-+		ne_propnames;
-+		ne_proppatch;
-+		ne_propset_iterate;
-+		ne_propset_lang;
-+		ne_propset_private;
-+		ne_propset_status;
-+		ne_propset_value;
-+		ne_simple_propfind;
-+		ne_ascii_to_md5;
-+		ne_md5_create_ctx;
-+		ne_md5_destroy_ctx;
-+		ne_md5_dup_ctx;
-+		ne_md5_finish_ascii;
-+		ne_md5_finish_ctx;
-+		ne_md5_process_block;
-+		ne_md5_process_bytes;
-+		ne_md5_read_ctx;
-+		ne_md5_reset_ctx;
-+		ne_md5_stream;
-+		ne_md5_to_ascii;
-+		ne_lock;
-+		ne_lock_copy;
-+		ne_lock_create;
-+		ne_lock_destroy;
-+		ne_lock_discover;
-+		ne_lock_free;
-+		ne_lock_refresh;
-+		ne_lock_using_parent;
-+		ne_lock_using_resource;
-+		ne_lockstore_add;
-+		ne_lockstore_create;
-+		ne_lockstore_destroy;
-+		ne_lockstore_findbyuri;
-+		ne_lockstore_first;
-+		ne_lockstore_next;
-+		ne_lockstore_register;
-+		ne_lockstore_remove;
-+		ne_unlock;
-+		ne_i18n_init;
-+		ne_asctime_parse;
-+		ne_httpdate_parse;
-+		ne_iso8601_parse;
-+		ne_rfc1036_parse;
-+		ne_rfc1123_date;
-+		ne_rfc1123_parse;
-+		ne_decompress_destroy;
-+		ne_decompress_reader;
-+		ne_add_depth_header;
-+		ne_copy;
-+		ne_delete;
-+		ne_get;
-+		ne_get_content_type;
-+		ne_get_range;
-+		ne_getmodtime;
-+		ne_mkcol;
-+		ne_move;
-+		ne_options;
-+		ne_options2;
-+		ne_post;
-+		ne_put;
-+		ne_add_proxy_auth;
-+		ne_add_server_auth;
-+		ne_forget_auth;
-+		ne_set_proxy_auth;
-+		ne_set_server_auth;
-+		ne_calloc;
-+		ne_malloc;
-+		ne_oom_callback;
-+		ne_realloc;
-+		ne_strdup;
-+		ne_strndup;
-+		ne_acl3744_set;
-+		ne_207_create;
-+		ne_207_destroy;
-+		ne_207_get_current_propstat;
-+		ne_207_get_current_response;
-+		ne_207_set_propstat_handlers;
-+		ne_207_set_response_handlers;
-+		ne_accept_207;
-+		ne_simple_request;
-+		GetVersionInfo;
-+	local:
-+		*;
-+};

neon/neon_exports_win.patch

---- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
-@@ -0,0 +1,294 @@
-+UDK_3_0_0 {
-+	global:
-+		ne_sspi_authenticate;
-+		ne_sspi_clear_context;
-+		ne_sspi_create_context;
-+		ne_sspi_deinit;
-+		ne_sspi_destroy_context;
-+		ne_sspi_init;
-+		ne__negotiate_ssl;
-+		ne__ssl_exit;
-+		ne__ssl_init;
-+		ne_ssl_cert_cmp;
-+		ne_ssl_cert_digest;
-+		ne_ssl_cert_export;
-+		ne_ssl_cert_free;
-+		ne_ssl_cert_identity;
-+		ne_ssl_cert_import;
-+		ne_ssl_cert_issuer;
-+		ne_ssl_cert_read;
-+		ne_ssl_cert_signedby;
-+		ne_ssl_cert_subject;
-+		ne_ssl_cert_validity_time;
-+		ne_ssl_cert_write;
-+		ne_ssl_clicert_decrypt;
-+		ne_ssl_clicert_encrypted;
-+		ne_ssl_clicert_free;
-+		ne_ssl_clicert_name;
-+		ne_ssl_clicert_owner;
-+		ne_ssl_clicert_read;
-+		ne_ssl_context_create;
-+		ne_ssl_context_destroy;
-+		ne_ssl_context_keypair;
-+		ne_ssl_context_set_flag;
-+		ne_ssl_context_set_verify;
-+		ne_ssl_context_trustcert;
-+		ne_ssl_dname_cmp;
-+		ne_ssl_readable_dname;
-+		ne_ssl_set_clicert;
-+		ne_ssl_trust_default_ca;
-+		ne_xml_dispatch_request;
-+		ne_xml_parse_response;
-+		ne_xml_create;
-+		ne_xml_currentline;
-+		ne_xml_destroy;
-+		ne_xml_doc_encoding;
-+		ne_xml_failed;
-+		ne_xml_get_attr;
-+		ne_xml_get_error;
-+		ne_xml_mapid;
-+		ne_xml_parse;
-+		ne_xml_parse_v;
-+		ne_xml_push_handler;
-+		ne_xml_resolve_nspace;
-+		ne_xml_set_error;
-+		ne_debug;
-+		ne_debug_init;
-+		ne_debug_mask;
-+		ne_debug_stream;
-+		ne_has_support;
-+		ne_parse_statusline;
-+		ne_version_match;
-+		ne_version_string;
-+		ne_path_childof;
-+		ne_path_compare;
-+		ne_path_escape;
-+		ne_path_has_trailing_slash;
-+		ne_path_parent;
-+		ne_path_unescape;
-+		ne_uri_cmp;
-+		ne_uri_copy;
-+		ne_uri_defaultport;
-+		ne_uri_free;
-+		ne_uri_parse;
-+		ne_uri_resolve;
-+		ne_uri_unparse;
-+		ne_base64;
-+		ne_buffer_altered;
-+		ne_buffer_append;
-+		ne_buffer_clear;
-+		ne_buffer_concat;
-+		ne_buffer_create;
-+		ne_buffer_destroy;
-+		ne_buffer_finish;
-+		ne_buffer_grow;
-+		ne_buffer_ncreate;
-+		ne_buffer_snprintf;
-+		ne_buffer_zappend;
-+		ne_concat;
-+		ne_qtoken;
-+		ne_shave;
-+		ne_snprintf;
-+		ne_strcasecmp;
-+		ne_strclean;
-+		ne_strerror;
-+		ne_strncasecmp;
-+		ne_token;
-+		ne_tolower_array;
-+		ne_unbase64;
-+		ne_vsnprintf;
-+		ne__sock_sslsock;
-+		ne_addr_destroy;
-+		ne_addr_error;
-+		ne_addr_first;
-+		ne_addr_next;
-+		ne_addr_resolve;
-+		ne_addr_result;
-+		ne_iaddr_cmp;
-+		ne_iaddr_free;
-+		ne_iaddr_make;
-+		ne_iaddr_print;
-+		ne_iaddr_reverse;
-+		ne_iaddr_typeof;
-+		ne_sock_accept;
-+		ne_sock_accept_ssl;
-+		ne_sock_block;
-+		ne_sock_cipher;
-+		ne_sock_close;
-+		ne_sock_connect;
-+		ne_sock_connect_ssl;
-+		ne_sock_connect_timeout;
-+		ne_sock_create;
-+		ne_sock_error;
-+		ne_sock_exit;
-+		ne_sock_fd;
-+		ne_sock_fullread;
-+		ne_sock_fullwrite;
-+		ne_sock_init;
-+		ne_sock_peek;
-+		ne_sock_peer;
-+		ne_sock_prebind;
-+		ne_sock_proxy;
-+		ne_sock_read;
-+		ne_sock_read_timeout;
-+		ne_sock_readline;
-+		ne_sock_sessid;
-+		ne__ssl_set_verify_err;
-+		ne_close_connection;
-+		ne_fill_proxy_uri;
-+		ne_fill_server_uri;
-+		ne_get_error;
-+		ne_get_scheme;
-+		ne_get_server_hostport;
-+		ne_get_session_flag;
-+		ne_hook_close_conn;
-+		ne_hook_create_request;
-+		ne_hook_destroy_request;
-+		ne_hook_destroy_session;
-+		ne_hook_post_headers;
-+		ne_hook_post_send;
-+		ne_hook_pre_send;
-+		ne_session_create;
-+		ne_session_destroy;
-+		ne_session_proxy;
-+		ne_set_addrlist;
-+		ne_set_connect_timeout;
-+		ne_set_error;
-+		ne_set_localaddr;
-+		ne_set_notifier;
-+		ne_set_progress;
-+		ne_set_read_timeout;
-+		ne_set_session_flag;
-+		ne_set_session_private;
-+		ne_set_useragent;
-+		ne_ssl_cert_validity;
-+		ne_ssl_provide_clicert;
-+		ne_ssl_set_verify;
-+		ne_ssl_trust_cert;
-+		ne_unhook_close_conn;
-+		ne_unhook_create_request;
-+		ne_unhook_destroy_request;
-+		ne_unhook_destroy_session;
-+		ne_unhook_post_headers;
-+		ne_unhook_post_send;
-+		ne_unhook_pre_send;
-+		ne_version_pre_http11;
-+		ne_accept_2xx;
-+		ne_accept_always;
-+		ne_add_request_header;
-+		ne_add_response_body_reader;
-+		ne_begin_request;
-+		ne_discard_response;
-+		ne_end_request;
-+		ne_get_request_flag;
-+		ne_get_request_private;
-+		ne_get_response_header;
-+		ne_get_session;
-+		ne_get_session_private;
-+		ne_get_status;
-+		ne_print_request_header;
-+		ne_read_response_block;
-+		ne_read_response_to_fd;
-+		ne_request_create;
-+		ne_request_destroy;
-+		ne_request_dispatch;
-+		ne_response_header_iterate;
-+		ne_set_request_body_buffer;
-+		ne_set_request_body_fd;
-+		ne_set_request_body_provider;
-+		ne_set_request_flag;
-+		ne_set_request_private;
-+		ne_redirect_location;
-+		ne_redirect_register;
-+		ne_propfind_allprop;
-+		ne_propfind_create;
-+		ne_propfind_current_private;
-+		ne_propfind_destroy;
-+		ne_propfind_get_parser;
-+		ne_propfind_get_request;
-+		ne_propfind_named;
-+		ne_propfind_set_private;
-+		ne_propnames;
-+		ne_proppatch;
-+		ne_propset_iterate;
-+		ne_propset_lang;
-+		ne_propset_private;
-+		ne_propset_status;
-+		ne_propset_value;
-+		ne_simple_propfind;
-+		ne_ascii_to_md5;
-+		ne_md5_create_ctx;
-+		ne_md5_destroy_ctx;
-+		ne_md5_dup_ctx;
-+		ne_md5_finish_ascii;
-+		ne_md5_finish_ctx;
-+		ne_md5_process_block;
-+		ne_md5_process_bytes;
-+		ne_md5_read_ctx;
-+		ne_md5_reset_ctx;
-+		ne_md5_stream;
-+		ne_md5_to_ascii;
-+		ne_lock;
-+		ne_lock_copy;
-+		ne_lock_create;
-+		ne_lock_destroy;
-+		ne_lock_discover;
-+		ne_lock_free;
-+		ne_lock_refresh;
-+		ne_lock_using_parent;
-+		ne_lock_using_resource;
-+		ne_lockstore_add;
-+		ne_lockstore_create;
-+		ne_lockstore_destroy;
-+		ne_lockstore_findbyuri;
-+		ne_lockstore_first;
-+		ne_lockstore_next;
-+		ne_lockstore_register;
-+		ne_lockstore_remove;
-+		ne_unlock;
-+		ne_i18n_init;
-+		ne_asctime_parse;
-+		ne_httpdate_parse;
-+		ne_iso8601_parse;
-+		ne_rfc1036_parse;
-+		ne_rfc1123_date;
-+		ne_rfc1123_parse;
-+		ne_decompress_destroy;
-+		ne_decompress_reader;
-+		ne_add_depth_header;
-+		ne_copy;
-+		ne_delete;
-+		ne_get;
-+		ne_get_content_type;
-+		ne_get_range;
-+		ne_getmodtime;
-+		ne_mkcol;
-+		ne_move;
-+		ne_options;
-+		ne_options2;
-+		ne_post;
-+		ne_put;
-+		ne_add_proxy_auth;
-+		ne_add_server_auth;
-+		ne_forget_auth;
-+		ne_set_proxy_auth;
-+		ne_set_server_auth;
-+		ne_calloc;
-+		ne_malloc;
-+		ne_oom_callback;
-+		ne_realloc;
-+		ne_strdup;
-+		ne_strndup;
-+		ne_free;
-+		ne_acl3744_set;
-+		ne_207_create;
-+		ne_207_destroy;
-+		ne_207_get_current_propstat;
-+		ne_207_get_current_response;
-+		ne_207_set_propstat_handlers;
-+		ne_207_set_response_handlers;
-+		ne_accept_207;
-+		ne_simple_request;
-+	local:
-+		*;
-+};

neon/neon_ne_set_request_flag.patch

---- misc/neon-0.29.5/src/ne_request.c	2010-09-28 13:57:26.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_request.c	2011-05-18 12:39:05.134445529 +0200
+--- src/ne_request.c	2010-09-28 13:57:26.000000000 +0200
++++ src/ne_request.c	2011-05-18 12:39:05.134445529 +0200
 @@ -529,7 +529,7 @@
  
  void ne_set_request_flag(ne_request *req, ne_request_flag flag, int value)

neon/prj/d.lst

-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\neon
-..\version.mk %_DEST%\inc\external\neon\version.mk
-..\%__SRC%\inc\ne_*.h %_DEST%\inc\external\neon\ne_*.h
-..\%__SRC%\lib\ineon.lib %_DEST%\lib\ineon.lib
-..\%__SRC%\bin\neon*.dll %_DEST%\bin\neon*.dll
-..\%__SRC%\lib\libneon*.so %_DEST%\lib\libneon*.so
-..\%__SRC%\lib\libneon*.dylib %_DEST%\lib\libneon*.dylib
-..\%__SRC%\lib\libneon*.a %_DEST%\lib\libneon*.a

neon/version.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# the major
-NEON_MAJOR=0
-# the minor
-NEON_MINOR=29
-# the micro
-NEON_MICRO=5
-
-# concat
-NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)
-

ooo.lst.in

@@ -64,7 +64,7 @@ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
 f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
+@NEON_TARBALL@
 3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
 9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
 a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz

solenv/inc/libs.mk

@@ -198,15 +198,6 @@ JPEG3RDLIB=-ljpeg
 .ELSE
 JPEG3RDLIB=-ljpeglib
 .ENDIF
-.IF "$(SYSTEM_NEON)" == "YES"
-NEON3RDLIB=-lneon
-.ELIF "$(GUI)$(COM)"=="WNTGCC"
-NEON3RDLIB=-lneon
-.ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
-.ELSE
-NEON3RDLIB=-lneon
-.ENDIF
 .IF "$(SYSTEM_DB)" == "YES"
 BERKELEYLIB=-l$(DB_LIB)
 .ELIF "$(GUI)$(COM)"=="WNTGCC"
@@ -455,7 +446,6 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
 EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
 ZLIB3RDLIB=zlib.lib
 JPEG3RDLIB=jpeglib.lib
-NEON3RDLIB=ineon.lib
 BERKELEYLIB=libdb47.lib
 CURLLIB=libcurl.lib
 CHAOSLIB=ichaos.lib

tail_build/prj/build.lst

-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CLUCENE:clucene CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CLUCENE:clucene CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL