external/libcmis/UnpackedTarball_cmis.mk | 3 ++- external/libcmis/libcmis-libxml2_compatibility.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
New commits: commit 1c9453cdf25ce6079be8489b77dbb75036bde908 Author: Douglas Mencken <[email protected]> Date: Fri Feb 28 09:04:21 2014 -0500 libcmis (bundled): add patch with missing definition for HTML_PARSE_RECOVER Change-Id: I4c3760808b92c066181ce7e1294ee9e6dd9ea016 Reviewed-on: https://gerrit.libreoffice.org/8387 Tested-by: LibreOffice gerrit bot <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index bbac1ac..8744951 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -16,7 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-0.4.1.patch \ external/libcmis/libcmis-0.4.1-empty-path.patch \ - external/libcmis/libcmis-0.4.1-properties-fix.patch)) + external/libcmis/libcmis-0.4.1-properties-fix.patch \ + external/libcmis/libcmis-libxml2_compatibility.patch)) ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch)) diff --git a/external/libcmis/libcmis-libxml2_compatibility.patch b/external/libcmis/libcmis-libxml2_compatibility.patch new file mode 100644 index 0000000..85db97e --- /dev/null +++ b/external/libcmis/libcmis-libxml2_compatibility.patch @@ -0,0 +1,14 @@ +# -*- Mode: Diff -*- +--- src/libcmis/oauth2-providers.cxx ++++ src/libcmis/oauth2-providers.cxx +@@ -34,6 +34,10 @@ + + using namespace std; + ++#if LIBXML_VERSION < 20621 ++#define HTML_PARSE_RECOVER 0 ++#endif ++ + string OAuth2Providers::OAuth2Gdrive( BaseSession* session, const string& authUrl, + const string& username, const string& password ) + {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
