[libreoffice] really really fix ppc64 build

David Tardon dtardon at fedoraproject.org
Thu Aug 28 14:21:56 UTC 2014


commit 1b9f1454d2350f5ed0a6014665235dc30d97c1a9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 28 16:21:48 2014 +0200

    really really fix ppc64 build

 0001-cast-arg-to-the-right-type.patch |   29 +++++++++++++++++++++++++++++
 libreoffice.spec                      |    1 +
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/0001-cast-arg-to-the-right-type.patch b/0001-cast-arg-to-the-right-type.patch
new file mode 100644
index 0000000..31f4ea1
--- /dev/null
+++ b/0001-cast-arg-to-the-right-type.patch
@@ -0,0 +1,29 @@
+From 10a269784fd425c2bef2c91f7c7a5ddd1a6d105b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 28 Aug 2014 16:10:11 +0200
+Subject: [PATCH] cast arg to the right type
+
+According to desc., typelib_TypeDescription can be safely used where
+typelib_TypeDescriptionReference is expected.
+
+Change-Id: Ibc3effd7e2894ba6ff738503e747f5157c146454
+---
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+index 5836d8b..b41cee6 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+@@ -233,7 +233,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+                 "fmr    %0,     1\n\t"
+                 : "=f" (dret), "=r" (r3), "=r" (r4) : );
+ 
+-    MapReturn(r3, r4, dret, pReturnTypeDescr, pRegisterReturn);
++    MapReturn(r3, r4, dret, reinterpret_cast<typelib_TypeDescriptionReference *>(pReturnTypeDescr), pRegisterReturn);
+ }
+ 
+ // Macros for easier insertion of values to registers or stack
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c167325..37f0b36 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -309,6 +309,7 @@ Patch21: 0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch
 Patch22: 0001-Resolves-rhbz-1125588-port-LibreOffice-to-ppc64le.patch
 Patch23: 0001-if-_CALL_ELF-if-defined-_CALL_ELF-_CALL_ELF-2.patch
 Patch24: 0001-fix-variable-name.patch
+Patch25: 0001-cast-arg-to-the-right-type.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice


More information about the scm-commits mailing list