diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-03-09 17:42:23 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-03-09 17:42:23 +0000 |
| commit | 04cb26992280e547c001ce535a6ef79e35663c1f (patch) | |
| tree | 2c176aef6a5f7ed3a54c87cb1ab85e1ab2c6bd77 /app-office | |
| parent | Version bump. Fix upstream bug #12305. (diff) | |
| download | gentoo-2-04cb26992280e547c001ce535a6ef79e35663c1f.tar.gz gentoo-2-04cb26992280e547c001ce535a6ef79e35663c1f.tar.bz2 gentoo-2-04cb26992280e547c001ce535a6ef79e35663c1f.zip | |
Fix building with =net-misc/neon-0.30* (bug #307501).
(Portage version: 15801-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/neon-remove-SSPI-support.diff | 25 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 7b6f206f012e..1dc8f5fd2967 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.522 2010/03/03 11:00:22 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.523 2010/03/09 17:42:21 arfrever Exp $ + + 09 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + openoffice-3.2.0.ebuild, +files/neon-remove-SSPI-support.diff: + Fix building with =net-misc/neon-0.30* (bug #307501). 03 Mar 2010; Christian Faulhammer <fauli@gentoo.org> openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/files/neon-remove-SSPI-support.diff b/app-office/openoffice/files/neon-remove-SSPI-support.diff new file mode 100644 index 000000000000..5e8d6aa4f51b --- /dev/null +++ b/app-office/openoffice/files/neon-remove-SSPI-support.diff @@ -0,0 +1,25 @@ +--- ucb/source/ucp/webdav/NeonSession.cxx ++++ ucb/source/ucp/webdav/NeonSession.cxx +@@ -257,9 +257,6 @@ + + // ------------------------------------------------------------------- + extern "C" int NeonSession_NeonAuth( void * inUserData, +-#ifdef NE_FEATURE_SSPI +- const char * inAuthProtocol, +-#endif + const char * inRealm, + int attempt, + char * inoutUserName, +@@ -334,12 +331,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 + + // #i97003# (tkr): Ask XMasterPasswordHandling if we should store the + // credentials persistently and give this information to the auth listener diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index fdb2a46776d9..1061ab492189 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.16 2010/03/03 11:00:22 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.17 2010/03/09 17:42:21 arfrever Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -222,6 +222,7 @@ src_prepare() { cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/npwrap-fix-nogtk.diff" "${S}/patches/hotfixes" || die + cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then |