[Libreoffice-commits] .: Branch 'gr2' - 6 commits - boost/boost_1_44_0.patch boost/boost.4713.warnings.patch boost/boost.gcc47679.patch dictionaries/prj icu/icu4c.8320.freeserif.crash.patch
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:05:42 PST 2011
boost/boost.4713.warnings.patch | 13 +++++++++++++
boost/boost.gcc47679.patch | 23 +++++++++++++++++++++++
boost/boost_1_44_0.patch | 3 ++-
dictionaries/prj/build.lst | 2 +-
icu/icu4c.8320.freeserif.crash.patch | 9 +++------
5 files changed, 42 insertions(+), 8 deletions(-)
New commits:
commit d0270e2ef37f00dd8d45909fcbcb49673fa20503
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 11:07:23 2011 +0700
reduce patch to remove need to match on trailing space that git strips
diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch
index 5acc62c..64b133d 100644
--- a/icu/icu4c.8320.freeserif.crash.patch
+++ b/icu/icu4c.8320.freeserif.crash.patch
@@ -31,10 +31,7 @@
lookupSelectArray[lookupListIndex] |= featureMask;
lookupOrderArray[store++] = lookupListIndex;
}
-@@ -121,8 +128,8 @@
- LookupProcessor::LookupProcessor(const char *baseAddress,
- Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset,
- LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures,
+@@ -124,5 +131,5 @@
LEErrorCode& success)
- : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL),
+ : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0),
commit 64f114bd31c1c0502af14c15d5738b108c2c8861
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 07:19:57 2011 +0700
fix icu patch
diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch
index 0b94864..5acc62c 100644
--- a/icu/icu4c.8320.freeserif.crash.patch
+++ b/icu/icu4c.8320.freeserif.crash.patch
@@ -10,7 +10,7 @@
le_uint32 lookupOrderCount;
--- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000
+++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000
-@@ -62,6 +62,10 @@
+@@ -70,6 +70,10 @@
if (selectMask != 0) {
const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup);
@@ -21,7 +21,7 @@
le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
glyphIterator.reset(lookupFlags, selectMask);
-@@ -96,6 +100,9 @@
+@@ -111,6 +115,9 @@
for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) {
le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]);
commit 002eef4838bc03e7fbc3f153e15bba2227550148
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 9 21:10:53 2011 +0000
build those with exceptions
diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch
index 9d7c526..4673919 100644
--- a/boost/boost_1_44_0.patch
+++ b/boost/boost_1_44_0.patch
@@ -1,11 +1,12 @@
--- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
+++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
-@@ -1,1 +1,20 @@
+@@ -1,1 +1,21 @@
-dummy
+PRJ=..$/..$/..$/..$/..$/..$/..$/..
+
+PRJNAME=boostthread
+TARGET=boostthread
++ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
+
+.IF "$(GUI)"=="WNT"
commit 09bdda1b94013effb181cb54d96cb7b9e6f8fadc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 4 12:55:14 2011 +0000
WaE: silence warnings
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index a096e37..29653ca 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -866,3 +866,16 @@
assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));
+--- misc/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-03-04 11:33:36.269274940 +0000
++++ misc/build/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-03-04 11:33:36.269274940 +0000
+@@ -259,6 +259,10 @@
+
+ static void enforce_null_policy( const Ty_* x, const char* msg )
+ {
++#ifdef BOOST_PTR_CONTAINER_NO_EXCEPTIONS
++ (void)x;
++ (void)msg;
++#endif
+ if( !allow_null )
+ {
+ BOOST_PTR_CONTAINER_THROW_EXCEPTION( 0 == x && "null not allowed",
commit 4a7bef54130c19379bc4cdebb4bcf76e9aea9528
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Mar 3 16:07:35 2011 +0100
On windows, dictionaries link with uwinapi.lib
diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
index 9e2799e..077470d 100644
--- a/dictionaries/prj/build.lst
+++ b/dictionaries/prj/build.lst
@@ -1,4 +1,4 @@
-di dictionaries : soltools mythes NULL
+di dictionaries : sal soltools mythes NULL
di dictionaries usr1 - all di_mkout NULL
di dictionaries\source nmake - all di_src NULL
di dictionaries\af_ZA nmake - all di_af_ZA di_src NULL
commit 1d261197d24fd1836de1c44e207de8aba1fff8f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 2 13:18:22 2011 +0000
silence warning with a specialization
diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
index 9612346..1c804aa 100644
--- a/boost/boost.gcc47679.patch
+++ b/boost/boost.gcc47679.patch
@@ -13,3 +13,26 @@
}
template<class OptionalPointee>
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000
+@@ -219,6 +219,20 @@
+ }
+ };
+
++ template <int Radix>
++ struct negative_accumulate<unsigned char, Radix>
++ {
++ // Use this accumulator if number is negative
++ static bool add(unsigned char& n, unsigned digit)
++ {
++ n *= Radix;
++ if (n < digit)
++ return false;
++ n -= digit;
++ return true;
++ }
++ };
++
+ template <int MaxDigits>
+ inline bool allow_more_digits(std::size_t i)
+ {
More information about the Libreoffice-commits
mailing list