[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-5-g5315bb3
The following commit has been merged in the debian-experimental-3.5 branch:
commit 5315bb35f5680bd77d142389fe3f0f7ab6408b2f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 16 23:14:23 2012 +0000
fix armel build
diff --git a/changelog b/changelog
index 1821ae8..18efbe6 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * debian/patches/armhf-bridges.diff: add armhf bridges fixes from
+ * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
Jani Monoses
* debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
remove, obsolete
diff --git a/patches/armhf-bridges-fix-armv4t-armel.diff b/patches/armhf-bridges-fix-armv4t-armel.diff
new file mode 100644
index 0000000..646d759
--- /dev/null
+++ b/patches/armhf-bridges-fix-armv4t-armel.diff
@@ -0,0 +1,16 @@
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+index 97eff51..b430d4f 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+@@ -279,7 +279,11 @@ void callVirtualMethod(
+ #endif
+ //Make the call
+ "ldr r5, %[pmethod]\n\t"
++#ifndef __ARM_ARCH_4T__
+ "blx r5\n\t"
++#else
++ "mov lr, pc ; bx r5\n\t"
++#endif
+
+ //Fill in return values
+ "mov %[r0], r0\n\t"
diff --git a/patches/series b/patches/series
index 05bb76c..ce3728a 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ mediwiki-oor-replace.diff
no-rcX-in-final.diff
odk-fix-rdb-paths.diff
armhf-bridges.diff
+armhf-bridges-fix-armv4t-armel.diff
--
LibreOffice packaging repository
Reply to: