[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-143-g38e8d12
The following commit has been merged in the debian-experimental-3.5 branch:
commit 38e8d129bd26d559084832a42bd6dfe4d83d7257
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Dec 19 11:20:07 2011 +0100
backport two master fixes that will hopefully be cherrypicked to -3-5 after beta
diff --git a/patches/fix-armhf-build-in-bridges.patch b/patches/fix-armhf-build-in-bridges.patch
new file mode 100644
index 0000000..61ae202
--- /dev/null
+++ b/patches/fix-armhf-build-in-bridges.patch
@@ -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
+--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++++ b/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/fix-racecondition-in-sdext-source-pdfimport-makefile.patch b/patches/fix-racecondition-in-sdext-source-pdfimport-makefile.patch
new file mode 100644
index 0000000..57f6377
--- /dev/null
+++ b/patches/fix-racecondition-in-sdext-source-pdfimport-makefile.patch
@@ -0,0 +1,32 @@
+From f2a1882be486986a76682ed51f481595e1cf0d5c Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 16 Dec 2011 19:55:37 +0100
+Subject: [PATCH 1/2] fix racecondition in sdext/source/pdfimport/makefile.mk
+
+---
+ sdext/source/pdfimport/makefile.mk | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
+index 641e90f..d33680f 100644
+--- a/sdext/source/pdfimport/makefile.mk
++++ b/sdext/source/pdfimport/makefile.mk
+@@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
++$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
++
++$(MISC)/descriptions : $(DESCRIPTION)
+ $(COPY) description-en-US.txt $(EXTENSIONDIR)
+ .IF "$(WITH_LANG)" != ""
+ $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+ .ENDIF
++ $(TOUCH) $@
+
+ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+--
+1.7.5.4
+
diff --git a/patches/series b/patches/series
index 61f14b4..4655732 100644
--- a/patches/series
+++ b/patches/series
@@ -15,5 +15,7 @@ smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
-sensible-lomua.diff
-sensible-browser.diff
+aensible-lomua.diff
+sensble-browser.dff
+fix-racecondition-in-sdext-source-pdfimport-makefile.patch
+fix-armhf-build-in-bridges.patch
--
LibreOffice packaging repository
Reply to: