[Libreoffice-commits] core.git: boost/boost.libcdr.warnings.patch.1 boost/boost.wshadow.patch hsqldb/patches hyphen/hyphen-android.patch jfreereport/patches libcmis/libcmis-0.3.0-proxy.patch liborcus/liborcus_0.1.0-dllimport.patch nss/nss.aix.patch nss/nss.patch python3/python-3.3.0-15833.patch.1 python3/python-3.3.0-i42553.patch.2 redland/raptor redland/rasqal redland/redland solenv/gbuild
Tor Lillqvist
tml at iki.fi
Mon May 27 09:15:29 PDT 2013
boost/boost.libcdr.warnings.patch.1 | 3 +--
boost/boost.wshadow.patch | 2 +-
hsqldb/patches/jdbc-4.1.patch | 12 ++++++------
hyphen/hyphen-android.patch | 2 +-
jfreereport/patches/flow-engine.patch | 3 ++-
jfreereport/patches/liblayout.patch | 3 ++-
libcmis/libcmis-0.3.0-proxy.patch | 2 +-
liborcus/liborcus_0.1.0-dllimport.patch | 2 +-
nss/nss.aix.patch | 2 +-
nss/nss.patch | 2 +-
python3/python-3.3.0-15833.patch.1 | 3 +++
python3/python-3.3.0-i42553.patch.2 | 1 +
redland/raptor/raptor-freebsd.patch.1 | 2 +-
redland/rasqal/rasqal-freebsd.patch.1 | 2 +-
redland/redland/redland-freebsd.patch.1 | 2 +-
solenv/gbuild/UnpackedTarball.mk | 2 +-
16 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 32565ee39be1a9d7be1de934c1dfb424644b346a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon May 27 18:22:32 2013 +0300
Bump maximum fuzz factor down to zero
Change-Id: I97d30afe3a24aab1123352da05b066095e5c86bb
diff --git a/boost/boost.libcdr.warnings.patch.1 b/boost/boost.libcdr.warnings.patch.1
index 61a6a8c..22888c4 100644
--- a/boost/boost.libcdr.warnings.patch.1
+++ b/boost/boost.libcdr.warnings.patch.1
@@ -438,7 +438,7 @@
}
template<class K, class D, class C>
-@@ -759,18 +759,18 @@
+@@ -759,17 +759,17 @@
std::basic_string<Ch>
>::type
basic_ptree<K, D, C>::get(
@@ -460,7 +460,6 @@
return child.get().
BOOST_NESTED_TEMPLATE get_value_optional<Type>(tr);
else
- return optional<Type>();
@@ -778,9 +778,9 @@
template<class K, class D, class C>
template<class Type>
diff --git a/boost/boost.wshadow.patch b/boost/boost.wshadow.patch
index d905d8b..b336f82 100644
--- a/boost/boost.wshadow.patch
+++ b/boost/boost.wshadow.patch
@@ -129,7 +129,7 @@
+ { return x._rng == y_arg._rng && x.y == y_arg.y && std::equal(x.v, x.v+k, y_arg.v); }
/** Returns true if the two generators will produce different sequences. */
BOOST_RANDOM_DETAIL_INEQUALITY_OPERATOR(shuffle_order_engine)
-
+
--- foo/foo/foo/boost/random/subtract_with_carry.hpp
+++ foo/foo/foo/boost/random/subtract_with_carry.hpp
@@ -268,21 +268,21 @@
diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch
index 782f446..7884148 100644
--- a/hsqldb/patches/jdbc-4.1.patch
+++ b/hsqldb/patches/jdbc-4.1.patch
@@ -128,7 +128,7 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:47:35.842635642 +0000
@@ -3375,4 +3375,18 @@
- }
+ */
//#endif JAVA6
+
@@ -149,7 +149,7 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000
@@ -48,6 +48,12 @@
- import java.sql.SQLXML;
+ */
//#endif JAVA6
+
@@ -162,7 +162,7 @@
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -2793,4 +2799,31 @@
- }
+ */
//#endif JAVA6
+
@@ -196,7 +196,7 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000
@@ -5693,4 +5693,21 @@
- }
+ */
//#endif JAVA6
+
@@ -232,7 +232,7 @@
/**
@@ -323,4 +328,15 @@
- }
+ */
//#endif JAVA6
+
@@ -250,7 +250,7 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000
@@ -5324,4 +5324,19 @@
- }
+ */
//#endif JAVA6
+
diff --git a/hyphen/hyphen-android.patch b/hyphen/hyphen-android.patch
index 6adc51d..d092d78 100644
--- a/hyphen/hyphen-android.patch
+++ b/hyphen/hyphen-android.patch
@@ -10,7 +10,7 @@
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -1215,7 +1215,7 @@
- | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
index ae68644..86f50a3 100644
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
@@ -1,6 +1,7 @@
--- misc/flow-engine-0.9.4/build.xml (Revision 6728)
+++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie)
-@@ -24,6 +24,7 @@
+@@ -24,7 +24,8 @@
+
<!-- Setup the compile classpath -->
<path id="classpath">
- <fileset dir="lib">
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index 6da2793..035d99b 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,6 +1,7 @@
--- misc/liblayout-0.2.10/build.xml (Revision 6728)
+++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie)
-@@ -24,6 +24,7 @@
+@@ -24,7 +24,8 @@
+
<!-- Setup the compile classpath -->
<path id="classpath">
- <fileset dir="lib">
diff --git a/libcmis/libcmis-0.3.0-proxy.patch b/libcmis/libcmis-0.3.0-proxy.patch
index 7311b02..a7e85da 100644
--- a/libcmis/libcmis-0.3.0-proxy.patch
+++ b/libcmis/libcmis-0.3.0-proxy.patch
@@ -125,7 +125,7 @@ index 587a05b..432e140 100644
+ url, username, password, verbose );
cout << "Repositories: name (id)" << endl;
- for ( list< libcmis::RepositoryPtr >::iterator it = repos.begin(); it != repos.end(); ++it )
+ for ( list< libcmis::RepositoryPtr >::iterator it = repos.begin(); it != repos.end(); it++ )
@@ -828,6 +870,11 @@ options_description CmisClient::getOptionsDescription( )
( "repository,r", value< string >(), "Name of the repository to use" )
( "username,u", value< string >(), "Username used to authenticate to the repository" )
diff --git a/liborcus/liborcus_0.1.0-dllimport.patch b/liborcus/liborcus_0.1.0-dllimport.patch
index 005085b..6255d06 100644
--- a/liborcus/liborcus_0.1.0-dllimport.patch
+++ b/liborcus/liborcus_0.1.0-dllimport.patch
@@ -1,6 +1,6 @@
--- include/orcus/env.hpp
+++ include/orcus/env.hpp
-@@ -35,15 +35,9 @@
+@@ -35,14 +35,8 @@
#else
#define ORCUS_DLLPUBLIC __declspec(dllexport)
#endif
diff --git a/nss/nss.aix.patch b/nss/nss.aix.patch
index c71fef5..a8a6a8e 100644
--- a/nss/nss.aix.patch
+++ b/nss/nss.aix.patch
@@ -9,7 +9,7 @@
+ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:2980: checking for sys/atomic_op.h" >&5
+ echo "configure:3466: checking for sys/atomic_op.h" >&5
@@ -3102,7 +3103,6 @@
AIX_LINK_OPTS='-brtl -bnso -berok'
;;
diff --git a/nss/nss.patch b/nss/nss.patch
index 728f79f..aa714a4 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -86,7 +86,7 @@
+DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
LDFLAGS += $(ARCHFLAG)
- # INCLUDES += -I/usr/include -Y/usr/include/linux
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
@@ -158,8 +161,13 @@
endif
endif
diff --git a/python3/python-3.3.0-15833.patch.1 b/python3/python-3.3.0-15833.patch.1
index 71cef94..7cb845f 100644
--- a/python3/python-3.3.0-15833.patch.1
+++ b/python3/python-3.3.0-15833.patch.1
@@ -23,3 +23,6 @@ iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+ except OSError as exc:
+ # Same as above: just don't write the bytecode.
+ _verbose_message('could not create {!r}: {!r}', path, exc)
+
+
+ class SourcelessFileLoader(FileLoader, _LoaderBasics):
diff --git a/python3/python-3.3.0-i42553.patch.2 b/python3/python-3.3.0-i42553.patch.2
index 324d071..2114522 100644
--- a/python3/python-3.3.0-i42553.patch.2
+++ b/python3/python-3.3.0-i42553.patch.2
@@ -15,3 +15,4 @@ Author: taniguchi at openoffice.org
-
#ifdef HAVE__GETPTY
#include <sys/types.h> /* we need to import mode_t */
+ extern char * _getpty(int *, int, mode_t, int);
diff --git a/redland/raptor/raptor-freebsd.patch.1 b/redland/raptor/raptor-freebsd.patch.1
index 679d853..349f3a1 100644
--- a/redland/raptor/raptor-freebsd.patch.1
+++ b/redland/raptor/raptor-freebsd.patch.1
@@ -14,7 +14,7 @@ Usual patch to produce Linux-like .so files on FreeBSD
+ revision="$number_revision"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor`
+ func_arith $number_major + $number_minor
@@ -7420,8 +7420,8 @@
;;
diff --git a/redland/rasqal/rasqal-freebsd.patch.1 b/redland/rasqal/rasqal-freebsd.patch.1
index 679d853..349f3a1 100644
--- a/redland/rasqal/rasqal-freebsd.patch.1
+++ b/redland/rasqal/rasqal-freebsd.patch.1
@@ -14,7 +14,7 @@ Usual patch to produce Linux-like .so files on FreeBSD
+ revision="$number_revision"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor`
+ func_arith $number_major + $number_minor
@@ -7420,8 +7420,8 @@
;;
diff --git a/redland/redland/redland-freebsd.patch.1 b/redland/redland/redland-freebsd.patch.1
index 679d853..349f3a1 100644
--- a/redland/redland/redland-freebsd.patch.1
+++ b/redland/redland/redland-freebsd.patch.1
@@ -14,7 +14,7 @@ Usual patch to produce Linux-like .so files on FreeBSD
+ revision="$number_revision"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor`
+ func_arith $number_major + $number_minor
@@ -7420,8 +7420,8 @@
;;
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 011b682..ab2d6ff 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" --fuzz=1 < "$$p"; \
+ $(GNUPATCH) -f -s "-p$$pl" --fuzz=0 < "$$p"; \
if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\
done && \
) \
More information about the Libreoffice-commits
mailing list