[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-31-g4f0b77c
The following commit has been merged in the master branch:
commit 4f0b77cb9985910fa062a10dc12fd8f634316406
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 3 09:26:14 2012 +0000
use qmake -query QT_INSTALL_LIBS
diff --git a/patches/add-debian-multiarch-support.diff b/patches/add-debian-multiarch-support.diff
index c54a265..4f6d358 100644
--- a/patches/add-debian-multiarch-support.diff
+++ b/patches/add-debian-multiarch-support.diff
@@ -3,28 +3,35 @@ 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(-)
-+
+@@ -0,0 +1,31 @@
+diff --git a/configure.in b/configure.in
-+index 59cb7fb..904003a 100644
++index 290b294..f3ca081 100644
+--- configure.in
++++ configure.in
-+@@ -7868,6 +7868,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
++@@ -7748,6 +7748,7 @@ dnl ===================================================================
++
++ KDE4_CFLAGS=""
++ KDE4_LIBS=""
+++QMAKE4="qmake"
++ MOC4="moc"
++ KDE_GLIB_CFLAGS=""
++ KDE_GLIB_LIBS=""
++@@ -7817,6 +7818,18 @@ 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"
+++ dnl Check for qmake
+++ AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+++ QMAKE4="$QMAKEQT4"
+++ if test "$QMAKE4" = "no" ; then
+++ AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+++ if test "$QMAKE4" = "no" ; then
+++ AC_MSG_ERROR([Qmake not found. Please specify
+++the root of your Qt installation by exporting QT4DIR before running "configure".])
+++ fi
+++ fi
+++
+++ qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs"
+ AC_MSG_CHECKING([for Qt4 libraries])
+ qt_lib_dir="no"
+ for lib_dir in $qt_libdirs ; do
-+--
-+1.7.5.4
-+
--
LibreOffice packaging repository
Reply to: