------------------------------------------------------------
revno: 1890
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-29 09:35:19 +0200
message:
update ooo-build to f7b99eb375dea6024a48ca1b41f8bc76c220a38e
removed:
patches/oofromtemplate-no-deprecated-slot.diff
added:
patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-03-24 23:21:21 +0000
+++ b/changelog 2010-03-29 07:35:19 +0000
@@ -12,8 +12,10 @@
* debian/patches/cws-linuxaxp01.diff: add alpha port from issue 110145
* debian/patches/redland-remove-patches.diff: remove redland patches
allowing to use system-redland (from issue 108911)
- * debian/patches/oofromtemplate-no-deprecated-slot.diff: don't use
- deprecated slot:5500 in oofromtemplate
+ * debian/patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff:
+ update ooo-build-3-2 branch
+ - Fix invalid iterator usage in X11SalGraphics::drawPolyPolygon
+ (closes: #575758)
* debian/shell-lib-extensions.sh: handle non-existant basis-link
(closes: #561498)
=== added file
'patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff'
--- a/patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
1970-01-01 00:00:00 +0000
+++ b/patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
2010-03-29 07:35:19 +0000
@@ -0,0 +1,117 @@
+diff --git a/NEWS b/NEWS
+index 7a103f7..fa4308f 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,7 +1,7 @@
+ ooo-build-3.2.0.9 (3.2 bugfix release)
+
+ + common bits:
+- + bridge fix for ARM (i#105359) [Doko]
++ + bridge fix for ARM (i#105359) [Calc, Rene]
+ + Calc bits:
+ + XLS import with drawing objects (bnc#588927) [Kohei]
+ + cut&paste problem in opcode list for "last used" functions [Kohei]
+diff --git a/bin/package-ooo b/bin/package-ooo
+index 50ceaf1..7c4b082 100755
+--- a/bin/package-ooo
++++ b/bin/package-ooo
+@@ -83,7 +83,7 @@ mkdir -p $MANDIR/man1
+ for app in calc draw impress math web writer base; do
+ create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" ||
exit 1;
+ done
+-create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "slot:5500" ||
exit 1;
++create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" ".uno:NewDoc"
|| exit 1;
+ create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
+ create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
+ if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index dc2c6c5..3723c9b 100644
+--- a/patches/dev300/apply
++++ b/patches/dev300/apply
+@@ -3574,6 +3574,7 @@ connectivity-build-fix.diff, i#107957, fridrich
+ oowintool-java6.diff, fridrich
+ connectivity-build-fix-mac.diff, thorsten
+ vcl-xinerama-clone-fix.diff, n#578730, thorsten
++vcl-stl-fix.diff, n#588957, thorsten
+
+ [ HyphenFix ]
+ # László Németh's patch for hyphen module
+diff --git a/patches/dev300/vcl-stl-fix.diff b/patches/dev300/vcl-stl-fix.diff
+new file mode 100644
+index 0000000..549ed3c
+--- /dev/null
++++ b/patches/dev300/vcl-stl-fix.diff
+@@ -0,0 +1,73 @@
++Fix iterator handliŋ for drawPolygon
++
++From: Thorsten Behrens <tbehr...@novell.com>
++
++
++---
++
++ vcl/unx/source/gdi/salgdi.cxx | 21 +++++++++++++++++++--
++ 1 files changed, 19 insertions(+), 2 deletions(-)
++
++
++diff --git vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi.cxx
++index ae281ab..0b02ad0 100644
++--- vcl/unx/source/gdi/salgdi.cxx
+++++ vcl/unx/source/gdi/salgdi.cxx
++@@ -1427,14 +1427,17 @@ bool X11SalGraphics::drawPolyPolygon( const
::basegfx::B2DPolyPolygon& rOrigPoly
++ // unless it splits another trapezoid that is still active
++ bool bSplit = false;
++ ActiveTrapSet::iterator aActiveTrapsIt = aActiveTraps.begin();
++- for(; aActiveTrapsIt != aActiveTraps.end(); ++aActiveTrapsIt )
+++ while(aActiveTrapsIt != aActiveTraps.end())
++ {
++ XTrapezoid& rLeftTrap = aTrapVector[ *aActiveTrapsIt ];
++
++ // skip until first overlap candidate
++ // TODO: use stl::*er_bound() instead
++ if( IsLeftOf( aTrapezoid.left, rLeftTrap.left) )
+++ {
+++ ++aActiveTrapsIt;
++ continue;
+++ }
++
++ // in the ActiveTrapSet there are still trapezoids where
++ // a vertical overlap with new trapezoids is no longer possible
++@@ -1445,15 +1448,26 @@ bool X11SalGraphics::drawPolyPolygon( const
::basegfx::B2DPolyPolygon& rOrigPoly
++ {
++ ActiveTrapSet::iterator it = aActiveTrapsIt;
++ if( aActiveTrapsIt != aActiveTraps.begin() )
+++ {
++ --aActiveTrapsIt;
++- aActiveTraps.erase( it );
+++ aActiveTraps.erase( it );
+++ ++aActiveTrapsIt;
+++ }
+++ else
+++ {
+++ aActiveTraps.erase( it );
+++ aActiveTrapsIt = aActiveTraps.begin();
+++ }
++ continue;
++ }
++
++ // check if there is horizontal overlap
++ // aTrapezoid.left==rLeftTrap.right is allowed though
++ if( !IsLeftOf( aTrapezoid.left, rLeftTrap.right ) )
+++ {
+++ ++aActiveTrapsIt;
++ continue;
+++ }
++
++ // prepare to split the old trapezoid and keep its upper part
++ // find the old trapezoids entry in the VerticalTrapSet and
remove it
++@@ -1463,7 +1477,10 @@ bool X11SalGraphics::drawPolyPolygon( const
::basegfx::B2DPolyPolygon& rOrigPoly
++ for(; aVTSit != aVTSPair.second; ++aVTSit )
++ {
++ if( *aVTSit != *aActiveTrapsIt )
+++ {
+++ ++aActiveTrapsIt;
++ continue;
+++ }
++ aVerticalTraps.erase( aVTSit );
++ break;
++ }
=== removed file 'patches/oofromtemplate-no-deprecated-slot.diff'
--- a/patches/oofromtemplate-no-deprecated-slot.diff 2010-03-24 23:03:48
+0000
+++ b/patches/oofromtemplate-no-deprecated-slot.diff 1970-01-01 00:00:00
+0000
@@ -1,13 +0,0 @@
-diff --git a/bin/package-ooo b/bin/package-ooo
-index 50ceaf1..7c4b082 100755
---- openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
-@@ -83,7 +83,7 @@ mkdir -p $MANDIR/man1
- for app in calc draw impress math web writer base; do
- create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" ||
exit 1;
- done
--create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "slot:5500" ||
exit 1;
-+create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" ".uno:NewDoc"
|| exit 1;
- create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
- create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
- if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
=== modified file 'patches/series'
--- a/patches/series 2010-03-24 23:03:48 +0000
+++ b/patches/series 2010-03-29 07:35:19 +0000
@@ -1,5 +1,5 @@
+branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
update-mysqlnative-cws.diff
system-mysqlcpp.diff
cws-linuxaxp01.diff
redland-remove-patches.diff
-oofromtemplate-no-deprecated-slot.diff
