[patch] Proposed patch for app-office/openoffice-3.2.1 (*not* libreoffice)

support-libxml2+icu.diff (text/plain), 1.60 KB, created by Florian on 2011-03-10 14:36:38 UTC

--- libxmlsec.orig/makefile.mk	2010-05-26 20:24:56.000000000 +0200
+++ libxmlsec/makefile.mk	2011-03-10 15:10:05.376136004 +0100
@@ -54,6 +54,7 @@
 #xmlsec1-noverify.patch: As per readme.txt. 
 #xmlsec1-mingw32.patch: Mingw32 support. 
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
+#xmlsec1-1.2.12_fix_extern_c.patch http://bugs.gentoo.org/show_bug.cgi?id=354911
 PATCH_FILES=\
    xmlsec1-configure.patch \
    xmlsec1-customkeymanage.patch \
@@ -61,8 +62,8 @@
    xmlsec1-nssdisablecallbacks.patch \
    xmlsec1-noverify.patch \
    xmlsec1-mingw32.patch \
-   xmlsec1-mingw-keymgr-mscrypto.patch
-
+   xmlsec1-mingw-keymgr-mscrypto.patch \
+   xmlsec1-1.2.12_fix_extern_c.patch
 
 ADDITIONAL_FILES= \
     include$/xmlsec$/mscrypto$/akmngr.h \
--- libxmlsec.orig/xmlsec1-1.2.12_fix_extern_c.patch	1970-01-01 01:00:00.000000000 +0100
+++ libxmlsec/xmlsec1-1.2.12_fix_extern_c.patch	2011-03-10 15:05:23.124136006 +0100
@@ -0,0 +1,23 @@
+--- misc/build/xmlsec1-1.2.12/include/xmlsec/xmlsec.h.orig	2009-06-25 22:53:18.000000000 +0200
++++ misc/build/xmlsec1-1.2.12/include/xmlsec/xmlsec.h	2011-03-10 15:04:05.213136015 +0100
+@@ -11,16 +11,16 @@
+ #ifndef __XMLSEC_H__
+ #define __XMLSEC_H__    
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif /* __cplusplus */ 
+-
+ #include <libxml/tree.h>
+ 
+ #include <xmlsec/version.h>
+ #include <xmlsec/exports.h>
+ #include <xmlsec/strings.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */ 
++
+ /***********************************************************************
+  *
+  * Basic types to make ports to exotic platforms easier