/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Mar 18 09:11:12 2012 UTC (2 years, 9 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
File MIME type: text/plain
FILE REMOVED
Add gb_FULLDEPS patch. Clear up other patches.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

1 --- libxmlsec/makefile.mk.ORIGINAL 2010-11-11 09:35:21.000000000 -0600
2 +++ libxmlsec/makefile.mk 2011-02-13 03:13:41.496866392 -0600
3 @@ -67,7 +67,8 @@
4 xmlsec1-noverify.patch \
5 xmlsec1-mingw32.patch \
6 xmlsec1-mingw-keymgr-mscrypto.patch \
7 - xmlsec1-vc10.patch
8 + xmlsec1-vc10.patch \
9 + xmlsec1-1.2.14_fix_extern_c.patch
10
11 ADDITIONAL_FILES= \
12 include$/xmlsec$/mscrypto$/akmngr.h \
13 --- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL 1969-12-31 18:00:00.000000000 -0600
14 +++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch 2011-02-13 03:11:34.740594681 -0600
15 @@ -0,0 +1,23 @@
16 +--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL 2009-12-05 15:19:18.000000000 -0600
17 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h 2011-02-13 03:09:42.917240245 -0600
18 +@@ -11,16 +11,16 @@
19 + #ifndef __XMLSEC_H__
20 + #define __XMLSEC_H__
21 +
22 +-#ifdef __cplusplus
23 +-extern "C" {
24 +-#endif /* __cplusplus */
25 +-
26 + #include <libxml/tree.h>
27 +
28 + #include <xmlsec/version.h>
29 + #include <xmlsec/exports.h>
30 + #include <xmlsec/strings.h>
31 +
32 ++#ifdef __cplusplus
33 ++extern "C" {
34 ++#endif /* __cplusplus */
35 ++
36 + /***********************************************************************
37 + *
38 + * Basic types to make ports to exotic platforms easier

  ViewVC Help
Powered by ViewVC 1.1.20