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

fix build on big endian archs

Browse Source
This commit is contained in:
David Tardon 2013-06-24 13:34:16 +02:00
parent 5ac635d155
commit 1b76eeab0d
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-convert-the-right-number-of-elements.patch Normal file
View File

@ -0,0 +1,26 @@
From e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
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

7
libreoffice.spec
View File

@ -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 <dtardon@redhat.com> - 1:4.1.0.1-5
- fix build on big endian archs
* Mon Jun 24 2013 David Tardon <dtardon@redhat.com> - 1:4.1.0.1-4
- put glade catalog into an extra packgae