/[gentoo-x86]/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Aug 30 08:34:47 2013 UTC (7 months, 2 weeks ago) by scarabeus
Branch: MAIN
Changes since 1.1: +42 -18 lines
Version bump to 4.0.5.2 and 4.1.1.2.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

1 From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001
2 From: David Tardon <dtardon@redhat.com>
3 Date: Mon, 12 Aug 2013 09:39:59 +0200
4 Subject: [PATCH] only use the SSPI support with internal neon
5
6 neon 0.30.0 has added support for SSPI (author of the commit is kso,
7 which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the
8 signature of ne_auth_creds remains the same as before. That means that
9 build with system neon 0.30.0 fails...
10 ---
11 RepositoryExternal.mk | 1 +
12 ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++--
13 2 files changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
16 index f866957..8c19c27 100644
17 --- a/RepositoryExternal.mk
18 +++ b/RepositoryExternal.mk
19 @@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES)
20 define gb_LinkTarget__use_neon
21 $(call gb_LinkTarget_add_defs,$(1),\
22 -DNEON_VERSION=0x$(NEON_VERSION) \
23 + -DSYSTEM_NEON \
24 )
25 $(call gb_LinkTarget_set_include,$(1),\
26 $$(INCLUDE) \
27 diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
28 index 34a1937..cee643a 100644
29 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
30 +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
31 @@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
32 }
33
34 extern "C" int NeonSession_NeonAuth( void * inUserData,
35 -#ifdef NE_FEATURE_SSPI
36 +#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
37 const char * inAuthProtocol,
38 #endif
39 const char * inRealm,
40 @@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData,
41
42 bool bCanUseSystemCreds = false;
43
44 -#ifdef NE_FEATURE_SSPI
45 +#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
46 bCanUseSystemCreds
47 = (attempt == 0) && // avoid endless loops
48 ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
49 --
50 1.7.12.4

  ViewVC Help
Powered by ViewVC 1.1.20