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

fix build on s390

Browse Source
This commit is contained in:
David Tardon 2015-01-29 10:29:53 +01:00
parent 4b76f6e4be
commit df46b52ad2
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-fix-assert-call.patch Normal file
View File

@ -0,0 +1,40 @@
From df756ee1f2c37c8ed02bf8b357102e577c41901f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 29 Jan 2015 10:26:01 +0100
Subject: [PATCH] fix assert call
Change-Id: I3b06c79b733cf4e97049a8a437680e1f8f339dac
---
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 4922278..a21e43e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -360,7 +360,7 @@ static typelib_TypeClass cpp_mediate(
// determine called method
sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
- assert(nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!");
+ assert(nMemberPos < pTypeDescr->nAllMembers); // illegal member index!
TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index c1815b4..1d95dee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -289,7 +289,7 @@ static void cpp_call(
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
- assert(pReturnTypeDescr, "### expected return type description!");
+ assert(pReturnTypeDescr); // ### expected return type description!
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
--
2.1.0

6
libreoffice.spec
View File

@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
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 and CC0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -332,6 +332,7 @@ Patch24: 0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
Patch25: 0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
Patch26: 0001-rhbz-1177022-vcl-fix-PDF-embedding-of-Type-1-fonts.patch
Patch27: 0001-don-t-strip-font-names-of-apparent-script-suffixes-a.patch
Patch28: 0001-fix-assert-call.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2355,6 +2356,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Thu Jan 29 2015 David Tardon <dtardon@redhat.com> - 1:4.4.0.3-5
- fix build on s390
* Wed Jan 28 2015 Petr Machata <pmachata@redhat.com> - 1:4.4.0.3-4
- Rebuild for boost 1.57.0