[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_rc2-1-12-g06be5b0

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 06be5b054d7eb15613ba1a1a65342bd361b7cc34
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jun 4 13:16:54 2012 +0200

    backport test fix from Fedora, should fix s390x (closes: #666746)

diff --git a/changelog b/changelog
index 103bb5c..05f7f2a 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,10 @@ libreoffice (1:3.5.4-1) unstable; urgency=medium
     remove other parts ...
   * debian/patches/jdk7.diff: ... and move here. Also add internal hsqldb
     buildfix.
+  * debian/patches/fix-Test-BigPtrArray-on-64bit-bigendian.diff: backport test
+    fix from Fedora, should fix s390x (closes: #666746), thanks Aurelien
+    Jarno
+
   * debian/rules:
     - exclude s390(x) from OOO_REPORTDESIGN_ARCH to not make "libreoffice"
       depend on -report-builder-bin there as extensions (and also
@@ -17,7 +21,7 @@ libreoffice (1:3.5.4-1) unstable; urgency=medium
   * merge from Ubuntu:
     - add control tags as per 'firefox distro add-on support'-spec 
 
- -- Rene Engelhard <rene@debian.org>  Mon, 04 Jun 2012 13:00:47 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 04 Jun 2012 13:16:25 +0200
 
 libreoffice (1:3.5.4~rc2-1) experimental; urgency=low
 
diff --git a/patches/fix-Test-BigPtrArray-on-64bit-bigendian.diff b/patches/fix-Test-BigPtrArray-on-64bit-bigendian.diff
new file mode 100644
index 0000000..b64a06c
--- /dev/null
+++ b/patches/fix-Test-BigPtrArray-on-64bit-bigendian.diff
@@ -0,0 +1,42 @@
+From 78719066cb546c7dc74e87488b9b7a695606cf7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm <at> redhat.com>
+Date: Tue, 6 Mar 2012 09:37:35 +0000
+Subject: [PATCH] wrong types used here, breaks 64bit bigendian
+
+---
+ sw/qa/core/Test-BigPtrArray.cxx |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
+index 7953dc3..d9be7a2 100644
+--- a/sw/qa/core/Test-BigPtrArray.cxx
++++ b/sw/qa/core/Test-BigPtrArray.cxx
+@@ -82,7 +82,7 @@ namespace /* private */
+     sal_Bool AddToCount(const ElementPtr& rElem, void* pArgs)
+     {
+         BigPtrEntryMock* const pbem = static_cast<BigPtrEntryMock* const>(rElem);
+-        pbem->setCount(pbem->getCount() + *((int*)pArgs));
++        pbem->setCount(pbem->getCount() + *((sal_uLong*)pArgs));
+         return true;
+     }
+ 
+@@ -655,7 +655,7 @@ public:
+         fillBigPtrArray(bparr, NUM_ENTRIES);
+         dumpBigPtrArray(bparr);
+ 
+-        int addCount = 1;
++        sal_uLong addCount = 1;
+         bparr.ForEach(AddToCount, &addCount);
+ 
+         for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
+@@ -715,7 +715,7 @@ public:
+         fillBigPtrArray(bparr, NUM_ENTRIES);
+         dumpBigPtrArray(bparr);
+ 
+-        int addCount = 1;
++        sal_uLong addCount = 1;
+         bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount);
+ 
+         sal_uLong i = 0;
+-- 
+1.7.7.6
diff --git a/patches/series b/patches/series
index e2726b9..992ec33 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ lp-926940-visio-mime-for-draw.diff
 gcc-4.4.diff
 lp-904212-add-missing-mimetypes-to-impress.desktop.diff
 ignore-sc_cellrangesbase-fails.diff
+fix-Test-BigPtrArray-on-64bit-bigendian.diff

-- 
LibreOffice packaging repository