[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 f1570877c9e22f046e8006822121c03e3cf8d6cc
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 17 23:20:09 2012 +0100
make armhf patches apply on 3.4.x
diff --git a/patches/armhf-bridges-fix-armv4t-armel.diff b/patches/armhf-bridges-fix-armv4t-armel.diff
index bfab854..af52fe0 100644
--- a/patches/armhf-bridges-fix-armv4t-armel.diff
+++ b/patches/armhf-bridges-fix-armv4t-armel.diff
@@ -3,8 +3,8 @@
@@ -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
++--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+@@ -279,7 +279,11 @@ void callVirtualMethod(
+ #endif
+ //Make the call
@@ -17,3 +17,10 @@
+
+ //Fill in return values
+ "mov %[r0], r0\n\t"
+--- libreoffice-3.4.5/libreoffice-build/patches/dev300/apply-old 2012-02-17 22:49:54.000000000 +0100
++++ libreoffice-3.4.5/libreoffice-build/patches/dev300/apply 2012-02-17 22:49:59.000000000 +0100
+@@ -1418,3 +1418,4 @@
+
+ [ armhf ]
+ armhf-bridges.diff
++armhf-bridges-fix-armv4t-armel.diff
diff --git a/patches/armhf-bridges.diff b/patches/armhf-bridges.diff
index b618995..e555e26 100644
--- a/patches/armhf-bridges.diff
+++ b/patches/armhf-bridges.diff
@@ -3,8 +3,8 @@
@@ -0,0 +1,463 @@
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+index d5faf15..27148dc 100644
-+--- a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
-++++ b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
++--- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+@@ -10,6 +10,17 @@
+ # define UNWIND @
+ #endif
@@ -48,8 +48,8 @@
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+index d347aa0..07bdea1 100644
-+--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
-++++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
++--- bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++++ bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+@@ -69,6 +69,9 @@ namespace
+ char * pTopStack = (char *)(pCallStack + 0);
+ char * pCppStack = pTopStack;
@@ -120,8 +120,8 @@
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+index f7a85ba..da36c75 100644
-+--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
-++++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
++--- bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++++ bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+@@ -93,7 +93,7 @@ namespace CPPU_CURRENT_NAMESPACE
+
+ namespace arm
@@ -133,8 +133,8 @@
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+index 9502b87..86a33d5 100644
-+--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
-++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+@@ -131,6 +131,20 @@ namespace arm
+ return false;
+ }
@@ -183,7 +183,7 @@
+ {
+ case typelib_TypeClass_HYPER:
+@@ -176,6 +192,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
-+ #if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
++ #if defined(__ARM_EABI__) || defined(__SOFTFP__)
+ pRegisterReturn[0] = r0;
+ #else
++ register float fret asm("s0");
@@ -464,3 +464,21 @@
+
+ // NO exception occurred...
+ *ppUnoExc = 0;
+--- libreoffice-3.4.5/libreoffice-build/patches/dev300/apply-old 2012-02-17 22:47:47.000000000 +0100
++++ libreoffice-3.4.5/libreoffice-build/patches/dev300/apply 2012-02-17 22:48:42.000000000 +0100
+@@ -50,7 +50,7 @@
+ # Slackware
+ Slackware : LinuxCommon, Mono, msaccess
+ # Debian
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, armhf
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
+ DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
+ # Ubuntu
+@@ -1415,3 +1415,6 @@
+ [ TemporaryHacks ]
+ disable-rhino.diff
+ bsh-hardcode-path.diff
++
++[ armhf ]
++armhf-bridges.diff
--
LibreOffice packaging repository
Reply to: