From 1b76eeab0dd650ac6e89732fe58824d4f15824a8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 24 Jun 2013 13:34:16 +0200 Subject: [PATCH] fix build on big endian archs --- ...convert-the-right-number-of-elements.patch | 26 +++++++++++++++++++ libreoffice.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-convert-the-right-number-of-elements.patch diff --git a/0001-convert-the-right-number-of-elements.patch b/0001-convert-the-right-number-of-elements.patch new file mode 100644 index 0000000..169f87f --- /dev/null +++ b/0001-convert-the-right-number-of-elements.patch @@ -0,0 +1,26 @@ +From e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 24 Jun 2013 13:31:27 +0200 +Subject: [PATCH] convert the right number of elements + +Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c +--- + include/oox/helper/binaryoutputstream.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx +index 0882821..56d8065 100644 +--- a/include/oox/helper/binaryoutputstream.hxx ++++ b/include/oox/helper/binaryoutputstream.hxx +@@ -84,7 +84,7 @@ template< typename Type > + void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount ) + { + sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type ); +- ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nWriteSize ) ); ++ ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nElemCount ) ); + writeMemory( opnArray, nWriteSize, sizeof( Type ) ); + } + +-- +1.8.2.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 780cd8f..2dbe5ac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -250,6 +250,7 @@ Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch Patch20: 0001-buildfix.patch Patch21: 0001-fix-rtf-import-on-big-endian.patch Patch22: 0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch +Patch23: 0001-convert-the-right-number-of-elements.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -999,6 +1000,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch20 -p1 -b .buildfix.patch %patch21 -p1 -b .fix-rtf-import-on-big-endian.patch %patch22 -p1 -b .rhbz-976304-gallery-elements-may-not-suppor.patch +%patch23 -p1 -b .convert-the-right-number-of-elements.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2073,6 +2075,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jun 24 2013 David Tardon - 1:4.1.0.1-5 +- fix build on big endian archs + * Mon Jun 24 2013 David Tardon - 1:4.1.0.1-4 - put glade catalog into an extra packgae