cppu/util/cppu.map | 1 +
cppu/util/uno_purpenvhelpergcc3.map | 1 +
cppuhelper/source/gcc3.map | 3 ++-
python/Python-2.6.1-svn-1.7.patch | 12 ++++++++++++
python/makefile.mk | 3 ++-
sal/util/sal.map | 1 +
sal/util/sal_textenc/saltextenc.map | 1 +
salhelper/source/gcc3.map | 5 +++--
solenv/bin/addsym.awk | 1 +
writerfilter/source/dmapper/NumberingManager.cxx | 16 ++++++++--------
10 files changed, 32 insertions(+), 12 deletions(-)
New commits:
commit 76cec6c3fd8fbddf2df706b3a26f38b11b2f0d83
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 17 23:53:41 2012 +0200
work around spurious signed overflow warnings
g++ (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5:
/com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow
does not occur when assuming that (X - c) > X is always false
[-Werror=strict-overflow]
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 334ee9c..68a3251 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -578,8 +578,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// attributes of the symbol and apply it to the numbering
level
OUString sStyle = rDMapper.getOrCreateCharStyle(
aStyleProps );
aLvlProps.realloc( aLvlProps.getLength() + 1);
- aLvlProps[aLvlProps.getLength() - 1].Name =
aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME );
- aLvlProps[aLvlProps.getLength() - 1].Value <<= sStyle;
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1].Name =
aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME );
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1].Value
<<= sStyle;
}
// Get the prefix / suffix / Parent numbering
@@ -596,18 +596,18 @@ void ListDef::CreateNumberingRules( DomainMapper&
rDMapper,
sText, nLevel, rPrefix, rSuffix );
aLvlProps.realloc( aLvlProps.getLength( ) + 4 );
- aLvlProps[ aLvlProps.getLength( ) - 4 ] = MAKE_PROPVAL(
PROP_PREFIX, rPrefix );
- aLvlProps[ aLvlProps.getLength( ) - 3 ] = MAKE_PROPVAL(
PROP_SUFFIX, rSuffix );
- aLvlProps[ aLvlProps.getLength( ) - 2 ] = MAKE_PROPVAL(
PROP_PARENT_NUMBERING, nParentNum );
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 4] =
MAKE_PROPVAL( PROP_PREFIX, rPrefix );
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 3] =
MAKE_PROPVAL( PROP_SUFFIX, rSuffix );
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 2] =
MAKE_PROPVAL( PROP_PARENT_NUMBERING, nParentNum );
- aLvlProps[ aLvlProps.getLength( ) - 1 ] = MAKE_PROPVAL(
PROP_POSITION_AND_SPACE_MODE,
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_POSITION_AND_SPACE_MODE,
sal_Int16(
text::PositionAndSpaceMode::LABEL_ALIGNMENT ) );
StyleSheetEntryPtr pParaStyle = pAbsLevel->GetParaStyle( );
if( pParaStyle.get())
{
aLvlProps.realloc( aLvlProps.getLength() + 1 );
- aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL(
PROP_PARAGRAPH_STYLE_NAME,
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_PARAGRAPH_STYLE_NAME,
pParaStyle->sConvertedStyleName );
}
@@ -623,7 +623,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
xOutlines->getChapterNumberingRules( );
aLvlProps.realloc( aLvlProps.getLength() + 1 );
- aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL(
PROP_HEADING_STYLE_NAME,
+
aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_HEADING_STYLE_NAME,
pParaStyle->sConvertedStyleName );
xOutlineRules->replaceByIndex( nLevel, uno::makeAny(
aLvlProps ) );
commit 5729da18a1852d842bd7de05d9d7fdcbec1e9ad5
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 17 23:00:20 2012 +0200
fdo#42865: privatized unique empty string symbol:
Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index 7c4ea7f..6efebe3 100644
--- a/cppu/util/cppu.map
+++ b/cppu/util/cppu.map
@@ -132,4 +132,5 @@ UDK_3.3 { # OOo 2.4
GLIBCXX_3.4 {
global:
_ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/cppu/util/uno_purpenvhelpergcc3.map
b/cppu/util/uno_purpenvhelpergcc3.map
index 83e05e2..4a1f61d 100644
--- a/cppu/util/uno_purpenvhelpergcc3.map
+++ b/cppu/util/uno_purpenvhelpergcc3.map
@@ -13,4 +13,5 @@ UDK_3_0_0 {
GLIBCXX_3.4 {
global:
_ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 6ce6cf1..4c48f56 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -411,5 +411,6 @@ global:
# Unique libstdc++ symbols:
GLIBCXX_3.4 {
global:
- _ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 753dfe7..7a431c3 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -667,4 +667,5 @@ PRIVATE_file.1 { # LibreOffice 3.6
GLIBCXX_3.4 {
global:
_ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/sal/util/sal_textenc/saltextenc.map
b/sal/util/sal_textenc/saltextenc.map
index 4b07d57..8e38ef0 100644
--- a/sal/util/sal_textenc/saltextenc.map
+++ b/sal/util/sal_textenc/saltextenc.map
@@ -36,4 +36,5 @@ UDK_3_0_0 {
GLIBCXX_3.4 {
global:
_ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index b475a1a..e40d45d 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -116,6 +116,7 @@ LIBO_UDK_3.6 { # symbols available in >= LibO 3.6
# Unique libstdc++ symbols:
GLIBCXX_3.4 {
-global:
-_ZGVNSt7num_put*; _ZNSt7num_put*;
+ global:
+ _ZGVNSt7num_put*; _ZNSt7num_put*;
+ _ZNSs4_Rep20_S_empty_rep_storageE;
};
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 4c18bdc..a9e64fb 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,6 +43,7 @@ END {
print "GLIBCXX_3.4 {"
print "global:"
print "_ZGVNSt7num_put*; _ZNSt7num_put*;"
+ print "_ZNSs4_Rep20_S_empty_rep_storageE;"
print "};"
}
state == 2 {
commit 7e5a6a385051569da1bf872989aef262f2d802e2
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 17 22:49:33 2012 +0200
python: svn 1.7 breaks the build because...
... the output of "svninfo" in a directory that doesn't contain a .svn
changed
Change-Id: I16b132663a7c8d9fd60eafafecfc7f9e82b69b29
diff --git a/python/Python-2.6.1-svn-1.7.patch
b/python/Python-2.6.1-svn-1.7.patch
new file mode 100644
index 0000000..b3d0014
--- /dev/null
+++ b/python/Python-2.6.1-svn-1.7.patch
@@ -0,0 +1,12 @@
+--- misc/build/Python-2.6.1/Makefile.pre.in 2012-05-17 22:05:39.445274789
+0200
++++ misc/build.new/Python-2.6.1/Makefile.pre.in 2012-05-17
22:05:15.214276225 +0200
+@@ -34,7 +34,8 @@
+ LINKCC= @LINKCC@
+ AR= @AR@
+ RANLIB= @RANLIB@
+-SVNVERSION= @SVNVERSION@
++# svnversion 1.7 changed its output from "exported" to "Unversioned directory"
++SVNVERSION="echo exported"
+
+ # Shell used by make (some versions default to the login shell, which is bad)
+ SHELL= /bin/sh
diff --git a/python/makefile.mk b/python/makefile.mk
index 874fd4f..1abe100 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -57,7 +57,8 @@ PATCH_FILES=\
Python-2.6.1-sysbase.patch \
Python-2.6.1-nohardlink.patch \
Python-2.6.1-py2422.patch \
- Python-2.6.1-py4768.patch
+ Python-2.6.1-py4768.patch \
+ Python-2.6.1-svn-1.7.patch \
CONFIGURE_DIR=
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
