[libreoffice] 01/01: do not set $kde_incdir to /usr/include since -isystem /usr/include makes the stuff FTBFS
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 9ca70aa392e49127ca8f294290b885ee2f31cda0
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Tue May 10 08:22:20 2016 +0200
do not set $kde_incdir to /usr/include since -isystem /usr/include makes the stuff FTBFS
---
changelog | 8 ++++++++
patches/kde4-cflags-no-usr-include.diff | 26 ++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 35 insertions(+)
diff --git a/changelog b/changelog
index ae48d2c..8b081af 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.1.3~rc2-4) UNRELEASED; urgency=medium
+
+ * debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
+ to /usr/include since -isystem /usr/include makes the stuff FTBFS
+ (closes: #823145)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 09 May 2016 19:53:53 +0200
+
libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium
* debian/rules:
diff --git a/patches/kde4-cflags-no-usr-include.diff b/patches/kde4-cflags-no-usr-include.diff
new file mode 100644
index 0000000..1b65d2f
--- /dev/null
+++ b/patches/kde4-cflags-no-usr-include.diff
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 36bb3a0..4df115e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11094,6 +11094,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ if test "x$kde_incdir" = "xno"; then
+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+ fi
++ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
+
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
+@@ -11111,7 +11112,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ fi
+
+ PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
+- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ if ! test -z "$kde_incdir"; then
++ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ else
++ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ fi
++
+ KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
+ KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "$KDE4_LIBS"
diff --git a/patches/series b/patches/series
index dbaa342..77bd49b 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
liborcus-0.11.diff
+kde4-cflags-no-usr-include.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: