[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: kde4-cflags-no-usr-include.diff is upstream



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit ebe76c458a59325b04154201045042f1426099d4
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 24 21:33:00 2016 +0200

    kde4-cflags-no-usr-include.diff is upstream
---
 patches/kde4-cflags-no-usr-include.diff | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/patches/kde4-cflags-no-usr-include.diff b/patches/kde4-cflags-no-usr-include.diff
deleted file mode 100644
index 1b65d2f..0000000
--- a/patches/kde4-cflags-no-usr-include.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: