| 1 |
scarabeus 13/08/30 08:34:47 |
| 2 |
|
| 3 |
Modified: libreoffice-4.1.0.4-neon-build.patch |
| 4 |
Log: |
| 5 |
Version bump to 4.0.5.2 and 4.1.1.2. |
| 6 |
|
| 7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: libreoffice-4.1.0.4-neon-build.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libreoffice-4.1.0.4-neon-build.patch 13 Aug 2013 05:24:47 -0000 1.1 |
| 23 |
+++ libreoffice-4.1.0.4-neon-build.patch 30 Aug 2013 08:34:47 -0000 1.2 |
| 24 |
@@ -1,27 +1,51 @@ |
| 25 |
---- ucb/source/ucp/webdav-neon/NeonSession.cxx |
| 26 |
-+++ ucb/source/ucp/webdav-neon/NeonSession.cxx |
| 27 |
-@@ -228,9 +228,6 @@ |
| 28 |
+From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: David Tardon <dtardon@××××××.com> |
| 30 |
+Date: Mon, 12 Aug 2013 09:39:59 +0200 |
| 31 |
+Subject: [PATCH] only use the SSPI support with internal neon |
| 32 |
+ |
| 33 |
+neon 0.30.0 has added support for SSPI (author of the commit is kso, |
| 34 |
+which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the |
| 35 |
+signature of ne_auth_creds remains the same as before. That means that |
| 36 |
+build with system neon 0.30.0 fails... |
| 37 |
+--- |
| 38 |
+ RepositoryExternal.mk | 1 + |
| 39 |
+ ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++-- |
| 40 |
+ 2 files changed, 3 insertions(+), 2 deletions(-) |
| 41 |
+ |
| 42 |
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk |
| 43 |
+index f866957..8c19c27 100644 |
| 44 |
+--- a/RepositoryExternal.mk |
| 45 |
++++ b/RepositoryExternal.mk |
| 46 |
+@@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES) |
| 47 |
+ define gb_LinkTarget__use_neon |
| 48 |
+ $(call gb_LinkTarget_add_defs,$(1),\ |
| 49 |
+ -DNEON_VERSION=0x$(NEON_VERSION) \ |
| 50 |
++ -DSYSTEM_NEON \ |
| 51 |
+ ) |
| 52 |
+ $(call gb_LinkTarget_set_include,$(1),\ |
| 53 |
+ $$(INCLUDE) \ |
| 54 |
+diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx |
| 55 |
+index 34a1937..cee643a 100644 |
| 56 |
+--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx |
| 57 |
++++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx |
| 58 |
+@@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, |
| 59 |
} |
| 60 |
|
| 61 |
extern "C" int NeonSession_NeonAuth( void * inUserData, |
| 62 |
-#ifdef NE_FEATURE_SSPI |
| 63 |
-- const char * inAuthProtocol, |
| 64 |
--#endif |
| 65 |
++#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON |
| 66 |
+ const char * inAuthProtocol, |
| 67 |
+ #endif |
| 68 |
const char * inRealm, |
| 69 |
- int attempt, |
| 70 |
- char * inoutUserName, |
| 71 |
-@@ -297,14 +294,6 @@ |
| 72 |
+@@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, |
| 73 |
|
| 74 |
bool bCanUseSystemCreds = false; |
| 75 |
|
| 76 |
-#ifdef NE_FEATURE_SSPI |
| 77 |
-- bCanUseSystemCreds |
| 78 |
-- = (attempt == 0) && // avoid endless loops |
| 79 |
-- ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. |
| 80 |
-- ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || |
| 81 |
-- ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); |
| 82 |
--#endif |
| 83 |
-- |
| 84 |
- int theRetVal = pListener->authenticate( |
| 85 |
- OUString::createFromAscii( inRealm ), |
| 86 |
- theSession->getHostName(), |
| 87 |
++#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON |
| 88 |
+ bCanUseSystemCreds |
| 89 |
+ = (attempt == 0) && // avoid endless loops |
| 90 |
+ ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. |
| 91 |
+-- |
| 92 |
+1.7.12.4 |
| 93 |
+ |
Archives