diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2011-03-02 10:38:22 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2011-03-02 10:38:22 +0000 |
| commit | cc3c5b1791cb914572700b7d4c8b2a179dfd6938 (patch) | |
| tree | 311942d1457b59f0f0f963ae6e4be86f0bd533c7 /app-office/libreoffice | |
| parent | Removing defunct samba mirror (diff) | |
| download | gentoo-2-cc3c5b1791cb914572700b7d4c8b2a179dfd6938.tar.gz gentoo-2-cc3c5b1791cb914572700b7d4c8b2a179dfd6938.tar.bz2 gentoo-2-cc3c5b1791cb914572700b7d4c8b2a179dfd6938.zip | |
Fix build with neon supporting SSPI, bug #356581
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff | 27 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.1.ebuild | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2e86f77d7e94..eb1a633f1f06 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.15 2011/02/24 15:09:45 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.16 2011/03/02 10:38:22 suka Exp $ + + 02 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.1.ebuild, + +files/libreoffice-3.3.1-neon_remove_SSPI_support.diff: + Fix build with neon supporting SSPI, bug #356581 24 Feb 2011; Andreas Proschofsky <suka@gentoo.org> -libreoffice-3.3.0.ebuild, -files/gentoo-3.3.0.diff, libreoffice-3.3.1.ebuild, diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff new file mode 100644 index 000000000000..4230374bb941 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff @@ -0,0 +1,27 @@ +--- ucb/source/ucp/webdav/NeonSession.cxx ++++ ucb/source/ucp/webdav/NeonSession.cxx +@@ -253,9 +253,6 @@ + + // ------------------------------------------------------------------- + extern "C" int NeonSession_NeonAuth( void * inUserData, +-#ifdef NE_FEATURE_SSPI +- const char * inAuthProtocol, +-#endif + const char * inRealm, + int attempt, + char * inoutUserName, +@@ -322,14 +319,6 @@ + + bool bCanUseSystemCreds = false; + +-#ifdef NE_FEATURE_SSPI +- bCanUseSystemCreds +- = (attempt == 0) && // avoid endless loops +- ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. +- ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || +- ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); +-#endif +- + int theRetVal = pListener->authenticate( + rtl::OUString::createFromAscii( inRealm ), + theSession->getHostName(), diff --git a/app-office/libreoffice/libreoffice-3.3.1.ebuild b/app-office/libreoffice/libreoffice-3.3.1.ebuild index fb3f1ec401a2..b114aeb89b7a 100644 --- a/app-office/libreoffice/libreoffice-3.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-3.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.2 2011/02/24 15:09:45 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.3 2011/03/02 10:38:22 suka Exp $ EAPI="3" @@ -277,6 +277,7 @@ src_prepare() { use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" cp -f "${FILESDIR}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes" cp -f "${FILESDIR}/libreoffice-3.3-libpng-1.5.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/libreoffice-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes" #Use flag checks if use java ; then |