From 0207c4aaaf25167a365d8b93cf6090efcef0927a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Apr 25 2012 06:17:07 +0000 Subject: fix broken test on 64bit big endian --- diff --git a/0001-wrong-types-used-here-breaks-64bit-bigendian.patch b/0001-wrong-types-used-here-breaks-64bit-bigendian.patch new file mode 100644 index 0000000..f48c6ea --- /dev/null +++ b/0001-wrong-types-used-here-breaks-64bit-bigendian.patch @@ -0,0 +1,43 @@ +From 78719066cb546c7dc74e87488b9b7a695606cf7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +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(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/libreoffice.spec b/libreoffice.spec index 2441ed4..4391939 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 Patch31: 0001-save-register-arguments-first.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))")} %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 %patch31 -p1 -b .save-register-arguments-first.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 # these are horribly incomplete--empty translations and copied english @@ -2286,6 +2288,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Wed Apr 25 2012 David Tardon - 3.5.3.2-1 - 3.5.3 rc2 +- fix broken test on 64bit big endian * Mon Apr 23 2012 David Tardon - 3.5.3.1-2 - rebuild for icu