mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
This commit is contained in:
Tor Lillqvist
2013-05-27 15:29:30 +03:00
parent aad5113e34
commit f60af9ca6b
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boost/boost.3780.aliasing.patch
View File

@@ -1,6 +1,6 @@
--- misc/boost_1_44_0/boost/function/function_base.hpp --- misc/boost_1_44_0/boost/function/function_base.hpp
+++ misc/build/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) { if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor = const functor_type* in_functor =

2
boost/boost.4510.warnings.patch
View File

@@ -1,8 +1,8 @@
--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++ misc/build/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 @@ @@ -56,6 +56,13 @@
} // namespace detail
} // namespace detail
+// MSVC 2008 produces 2 warnings "default constructor could not be generated" +// MSVC 2008 produces 2 warnings "default constructor could not be generated"
+// here that run over ~100 lines :( +// here that run over ~100 lines :(

2
boost/boost.gcc47679.patch
View File

@@ -40,7 +40,7 @@
+++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#include "boost/optional/optional_fwd.hpp" #include <boost/optional/optional_fwd.hpp>
+#include <string.h> +#include <string.h>
+ +

2
hsqldb/patches/jdbc-4.1.patch
View File

@@ -272,8 +272,8 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000 --- 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 +++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000
@@ -1608,4 +1608,16 @@ @@ -1608,4 +1608,16 @@
throw new UnsupportedOperationException("Not supported yet.");
} }
*/
//#endif JAVA6 //#endif JAVA6
+ +
+//#ifdef JAVA7 +//#ifdef JAVA7

4
hunspell/hunspell-1.3.2-overflow.patch
View File

@@ -6,9 +6,9 @@
+#include <limits> +#include <limits>
+ +
#include <vector>
#include "affixmgr.hxx" #include "affixmgr.hxx"
#include "affentry.hxx"
#include "langnum.hxx"
@@ -4000,7 +4002,10 @@ @@ -4000,7 +4002,10 @@
case 3: { case 3: {
np++; np++;

6
nss/nss.patch
View File

@@ -13,7 +13,7 @@
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
@@ -39,8 +39,12 @@ @@ -39,8 +39,12 @@
DEFAULT_COMPILER = cc DEFAULT_COMPILER = gcc
-CC = gcc -CC = gcc
-CCC = g++ -CCC = g++
@@ -88,8 +88,8 @@
# INCLUDES += -I/usr/include -Y/usr/include/linux # INCLUDES += -I/usr/include -Y/usr/include/linux
@@ -158,8 +161,13 @@ @@ -158,8 +161,13 @@
# endif
CPU_TAG = _$(CPU_ARCH) endif
+ifeq ($(SYSTEM_ZLIB),YES) +ifeq ($(SYSTEM_ZLIB),YES)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz +# Currently (3.12.4) only the tools modutil and signtool are linked with libz

2
solenv/gbuild/UnpackedTarball.mk
View File

@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \ for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \ pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ 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;\ if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\
done && \ done && \
) \ ) \