rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix broken test on 64bit big endian

Browse Source
This commit is contained in:
David Tardon 2012-04-25 08:17:07 +02:00
parent 34f5af5851
commit 0207c4aaaf
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0001-wrong-types-used-here-breaks-64bit-bigendian.patch Normal file
View File

@ -0,0 +1,43 @@
From 78719066cb546c7dc74e87488b9b7a695606cf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@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

3
libreoffice.spec
View File

@ -143,6 +143,7 @@ Patch29: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
Patch30: 0001-fdo-38088-better-CSV-import-default-separators.patch Patch30: 0001-fdo-38088-better-CSV-import-default-separators.patch
Patch31: 0001-save-register-arguments-first.patch Patch31: 0001-save-register-arguments-first.patch
Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -997,6 +998,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch30 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch %patch30 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch
%patch31 -p1 -b .save-register-arguments-first.patch %patch31 -p1 -b .save-register-arguments-first.patch
%patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch %patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
%patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch
# TODO: check this # TODO: check this
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
@ -2286,6 +2288,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%changelog %changelog
* Wed Apr 25 2012 David Tardon <dtardon@redhat.com> - 3.5.3.2-1 * Wed Apr 25 2012 David Tardon <dtardon@redhat.com> - 3.5.3.2-1
- 3.5.3 rc2 - 3.5.3 rc2
- fix broken test on 64bit big endian
* Mon Apr 23 2012 David Tardon <dtardon@redhat.com> - 3.5.3.1-2 * Mon Apr 23 2012 David Tardon <dtardon@redhat.com> - 3.5.3.1-2
- rebuild for icu - rebuild for icu