diff options
| author | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-13 16:15:21 +0100 |
|---|---|---|
| committer | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-13 16:15:21 +0100 |
| commit | ca30905ed764c2c08870f03cc46dca84af381dbf (patch) | |
| tree | 54fc7160d828c0cd573b488e88e06a41b666cba5 | |
| parent | ee0684ff5ec0db1337d3491136bea4fd9eb9760a (diff) | |
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
| -rw-r--r-- | libxmlsec/makefile.mk | 3 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index c37e34d..1d5b2fe 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -67,7 +67,8 @@ PATCH_FILES=\ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ xmlsec1-mingw-keymgr-mscrypto.patch \ - xmlsec1-vc10.patch + xmlsec1-vc10.patch \ + xmlsec1-1.2.14_fix_extern_c.patch ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ diff --git a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch b/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch new file mode 100644 index 0000000..f5bbf5e --- /dev/null +++ b/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch @@ -0,0 +1,23 @@ +--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL 2009-12-05 15:19:18.000000000 -0600 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h 2011-02-13 03:09:42.917240245 -0600 +@@ -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 |