[Libreoffice-commits] core.git: boost/boost.3780.aliasing.patch boost/boost.4510.warnings.patch boost/boost.gcc47679.patch hsqldb/patches hunspell/hunspell-1.3.2-overflow.patch nss/nss.patch solenv/gbuild

[Tor Lillqvist]

 boost/boost.3780.aliasing.patch        |    2 +-
 boost/boost.4510.warnings.patch        |    2 +-
 boost/boost.gcc47679.patch             |    2 +-
 hsqldb/patches/jdbc-4.1.patch          |    2 +-
 hunspell/hunspell-1.3.2-overflow.patch |    4 ++--
 nss/nss.patch                          |    6 +++---
 solenv/gbuild/UnpackedTarball.mk       |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f60af9ca6b6a66693d08ec08253f8d38a47d0050
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 27 15:29:30 2013 +0300

    Use a maximum fuzz factor of 1 for our patches to 3rd-party code
    
    Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4

diff --git a/boost/boost.3780.aliasing.patch b/boost/boost.3780.aliasing.patch
index f279e33..d9cff1b 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 826c570..11fdace 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 72ab15a..e62a874 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 68180a2..782f446 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 46d4c67..8500b48 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 ca81061..728f79f 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 a62b42a..011b682 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 && \
 		) \