diff options
| -rw-r--r-- | boost/boost.3780.aliasing.patch | 2 | ||||
| -rw-r--r-- | boost/boost.4510.warnings.patch | 2 | ||||
| -rw-r--r-- | boost/boost.gcc47679.patch | 2 | ||||
| -rw-r--r-- | hsqldb/patches/jdbc-4.1.patch | 2 | ||||
| -rw-r--r-- | hunspell/hunspell-1.3.2-overflow.patch | 4 | ||||
| -rw-r--r-- | nss/nss.patch | 6 | ||||
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/boost/boost.3780.aliasing.patch b/boost/boost.3780.aliasing.patch index f279e33a9412..d9cff1b7aa99 100644 --- a/boost/boost.3780.aliasing.patch +++ b/boost/boost.3780.aliasing.patch @@ -1,6 +1,6 @@ --- misc/boost_1_44_0/boost/function/function_base.hpp +++ misc/build/boost_1_44_0/boost/function/function_base.hpp -@@ -314,15 +322,15 @@ +@@ -314,17 +322,17 @@ { if (op == clone_functor_tag || op == move_functor_tag) { const functor_type* in_functor = diff --git a/boost/boost.4510.warnings.patch b/boost/boost.4510.warnings.patch index 826c57052068..11fdaceef1e2 100644 --- a/boost/boost.4510.warnings.patch +++ b/boost/boost.4510.warnings.patch @@ -1,8 +1,8 @@ --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp @@ -56,6 +56,13 @@ - } // namespace detail + } // namespace detail +// MSVC 2008 produces 2 warnings "default constructor could not be generated" +// here that run over ~100 lines :( diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 72ab15a97b09..e62a874c1bfc 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -40,7 +40,7 @@ +++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 @@ -31,6 +31,8 @@ - #include "boost/optional/optional_fwd.hpp" + #include <boost/optional/optional_fwd.hpp> +#include <string.h> + diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch index 68180a2c6eb6..782f446b4929 100644 --- a/hsqldb/patches/jdbc-4.1.patch +++ b/hsqldb/patches/jdbc-4.1.patch @@ -272,8 +272,8 @@ --- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000 +++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000 @@ -1608,4 +1608,16 @@ - throw new UnsupportedOperationException("Not supported yet."); } + */ //#endif JAVA6 + +//#ifdef JAVA7 diff --git a/hunspell/hunspell-1.3.2-overflow.patch b/hunspell/hunspell-1.3.2-overflow.patch index 46d4c6787be2..8500b483d53f 100644 --- a/hunspell/hunspell-1.3.2-overflow.patch +++ b/hunspell/hunspell-1.3.2-overflow.patch @@ -6,9 +6,9 @@ +#include <limits> + + #include <vector> + #include "affixmgr.hxx" - #include "affentry.hxx" - #include "langnum.hxx" @@ -4000,7 +4002,10 @@ case 3: { np++; diff --git a/nss/nss.patch b/nss/nss.patch index ca8106141c36..728f79f15e23 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -13,7 +13,7 @@ +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 @@ -39,8 +39,12 @@ - DEFAULT_COMPILER = cc + DEFAULT_COMPILER = gcc -CC = gcc -CCC = g++ @@ -88,8 +88,8 @@ # INCLUDES += -I/usr/include -Y/usr/include/linux @@ -158,8 +161,13 @@ - # - CPU_TAG = _$(CPU_ARCH) + endif + endif +ifeq ($(SYSTEM_ZLIB),YES) +# Currently (3.12.4) only the tools modutil and signtool are linked with libz diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index a62b42aaba48..011b68205086 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\ for p in $(UNPACKED_PATCHES); do \ pl=$(UNPACKED_PATCHLEVEL); \ s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ - $(GNUPATCH) -f -s "-p$$pl" < "$$p"; \ + $(GNUPATCH) -f -s "-p$$pl" --fuzz=1 < "$$p"; \ if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\ done && \ ) \ |