[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-16-ge330a4f
The following commit has been merged in the master branch:
commit b65b92296f7187980cf04d57fd37c9c90e31f63e
Author: Rene Engelhard <rene@debian.org>
Date: Mon Dec 19 13:56:31 2011 +0100
fix armhf build in bridges
diff --git a/patches/fix-armhf-build-in-bridges.patch b/patches/fix-armhf-build-in-bridges.patch
new file mode 100644
index 0000000..0478b80
--- /dev/null
+++ b/patches/fix-armhf-build-in-bridges.patch
@@ -0,0 +1,41 @@
+--- /dev/null 2011-12-15 01:37:17.931118287 +0100
++++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/fix-armhf-build-in-bridges.patch 2011-12-19 13:54:28.000000000 +0100
+@@ -0,0 +1,38 @@
++From f233f3973631c664e0953f04f88a58234390c088 Mon Sep 17 00:00:00 2001
++From: Matthias Klose <matthias.klose@canonical.com>
++Date: Mon, 19 Dec 2011 10:51:43 +0100
++Subject: [PATCH 2/2] fix armhf build in bridges
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Signed-off-by: Caolán McNamara <caolanm@redhat.com>
++---
++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++index 5b02678..9502b87 100644
++--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
++ pRegisterReturn[0] = r0;
++ break;
++ case typelib_TypeClass_FLOAT:
++-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
++ pRegisterReturn[0] = r0;
++ #else
++ *(float*)pRegisterReturn = fret;
++ #endif
++ break;
++ case typelib_TypeClass_DOUBLE:
++-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
++ pRegisterReturn[1] = r1;
++ pRegisterReturn[0] = r0;
++ #else
++--
++1.7.5.4
++
diff --git a/patches/series b/patches/series
index abf411f..f9d69bf 100644
--- a/patches/series
+++ b/patches/series
@@ -24,3 +24,4 @@ jdk-1.7.0-vendorname.diff
s390x.diff
update-libreoffice.1.diff
wordml2ooo_draw.xsl-add-missing-include.diff
+fix-armhf-build-in-bridges.patch
--
LibreOffice packaging repository
Reply to: