[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-30-gfc07ffb
The following commit has been merged in the master branch:
commit fac47c990ca8ba84a99053386335cfbbe3e46f88
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 16 01:33:09 2011 +0100
qt4 debian multiarch support
diff --git a/patches/add-debian-multiarch-support.diff b/patches/add-debian-multiarch-support.diff
new file mode 100644
index 0000000..c54a265
--- /dev/null
+++ b/patches/add-debian-multiarch-support.diff
@@ -0,0 +1,30 @@
+diff --git a/patches/add-debian-multiarch-support.diff b/patches/add-debian-multiarch-support.diff
+new file mode 100644
+index 0000000..1f008fb
+--- /dev/null
++++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/add-debian-multiarch-support.diff
+@@ -0,0 +1,24 @@
++From fe0e97628499a1485b71c87736029cadf9a7669f Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Fri, 16 Dec 2011 02:06:28 +0100
++Subject: [PATCH] add debian multiarch support
++
++---
++ configure.in | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git a/configure.in b/configure.in
++index 59cb7fb..904003a 100644
++--- configure.in
+++++ configure.in
++@@ -7868,6 +7868,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
++ AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
++ fi
++
+++ qt_libdirs="/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` $qt_libdirs"
++ AC_MSG_CHECKING([for Qt4 libraries])
++ qt_lib_dir="no"
++ for lib_dir in $qt_libdirs ; do
++--
++1.7.5.4
++
diff --git a/patches/series b/patches/series
index 21dfb80..637bab5 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ update-libreoffice.1.diff
wordml2ooo_draw.xsl-add-missing-include.diff
fix-armhf-build-in-bridges.diff
fdo43139.diff
+add-debian-multiarch-support.diff
--
LibreOffice packaging repository
Reply to: