diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-08-13 05:24:47 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-08-13 05:24:47 +0000 |
| commit | e650adb3170884d0a808f28eccbb3f553e61d6d7 (patch) | |
| tree | e6b48a15ac7f87f384e6186b266eed5aeb12c631 /app-office | |
| parent | Dev channel bump. Remove old. (diff) | |
| download | gentoo-2-e650adb3170884d0a808f28eccbb3f553e61d6d7.tar.gz gentoo-2-e650adb3170884d0a808f28eccbb3f553e61d6d7.tar.bz2 gentoo-2-e650adb3170884d0a808f28eccbb3f553e61d6d7.zip | |
Build fix for neon-0.30 #479604
(Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch | 27 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.0.4.ebuild | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 408f1526ef94..1953be6c8d41 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.498 2013/08/09 08:55:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.499 2013/08/13 05:24:47 patrick Exp $ + + 13 Aug 2013; Patrick Lauer <patrick@gentoo.org> + +files/libreoffice-4.1.0.4-neon-build.patch, libreoffice-4.1.0.4.ebuild: + Build fix for neon-0.30 #479604 09 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Raise the dep on cmis. diff --git a/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch b/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch new file mode 100644 index 000000000000..298e2228d8fa --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch @@ -0,0 +1,27 @@ +--- ucb/source/ucp/webdav-neon/NeonSession.cxx ++++ ucb/source/ucp/webdav-neon/NeonSession.cxx +@@ -228,9 +228,6 @@ + } + + extern "C" int NeonSession_NeonAuth( void * inUserData, +-#ifdef NE_FEATURE_SSPI +- const char * inAuthProtocol, +-#endif + const char * inRealm, + int attempt, + char * inoutUserName, +@@ -297,14 +294,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( + OUString::createFromAscii( inRealm ), + theSession->getHostName(), diff --git a/app-office/libreoffice/libreoffice-4.1.0.4.ebuild b/app-office/libreoffice/libreoffice-4.1.0.4.ebuild index d305b8508aac..87b9119205f9 100644 --- a/app-office/libreoffice/libreoffice-4.1.0.4.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.0.4.ebuild,v 1.2 2013/07/29 09:28:03 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.0.4.ebuild,v 1.3 2013/08/13 05:24:47 patrick Exp $ EAPI=5 @@ -355,6 +355,7 @@ src_prepare() { # hack... mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die fi + epatch "${FILESDIR}/libreoffice-4.1.0.4-neon-build.patch" || die "Failed patching for neon" } src_configure() { |