[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-29-g6fa59fe
The following commit has been merged in the master branch:
commit 76c1a28cd0ac5d9c645da210b8e27b5467b9fa1b
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 87b5582..915a9ea 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
* debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
for -wiki-publishers config (hopefully closes: #616011)
- * debian/patches/armhf-bridges.diff: add armhf bridges fixes from
+ * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
Jani Monoses
* debian/rules:
diff --git a/patches/armhf-bridges-fix-armv4t-armel.diff b/patches/armhf-bridges-fix-armv4t-armel.diff
new file mode 100644
index 0000000..bfab854
--- /dev/null
+++ b/patches/armhf-bridges-fix-armv4t-armel.diff
@@ -0,0 +1,19 @@
+--- /dev/null 2012-02-09 21:05:27.569194310 +0100
++++ libreoffice-3.4.5/libreoffice-build/patches/dev300/armhf-bridges-fix-armv4t-armel.diff 2012-02-17 22:46:04.000000000 +0100
+@@ -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 d3f73ca..fecdfa6 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ add-debian-multiarch-support.diff
jdbc-driver-threading.diff
mediwiki-oor-replace.diff
armhf-bridges.diff
+armhf-bridges-fix-armv4t-armel.diff
--
LibreOffice packaging repository
Reply to: