[silo-llnl] 74/96: Fix for Qt5

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 0f3eca7450416df0ba746573dd71fa62c2cce19f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 18:08:51 2014 +0100

    Fix for Qt5
---
 debian/patches/qt5.patch | 22 ++++++++++++++++++++++
 debian/patches/series    |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
new file mode 100644
index 0000000..ca7a1a6
--- /dev/null
+++ b/debian/patches/qt5.patch
@@ -0,0 +1,22 @@
+Index: silo-llnl-4.9.1/config/ax_have_qt.m4
+===================================================================
+--- silo-llnl-4.9.1.orig/config/ax_have_qt.m4	2014-05-01 17:57:09.000000000 +0100
++++ silo-llnl-4.9.1/config/ax_have_qt.m4	2014-05-01 18:07:27.023653517 +0100
+@@ -194,7 +194,7 @@
+     fi # all $ax_qt_* are set
+   fi   # $have_qt reflects the system status
+   if test x"$have_qt" = xyes; then
+-    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets"
+     if test x"$ax_qt_lib" = xqt-mt; then
+         QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+     fi
+@@ -432,7 +432,7 @@
+       LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+       ax_qt_LIBS="$LIBS"
+       ax_save_CXXFLAGS="$CXXFLAGS"
+-      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets"
+       AC_TRY_LINK([#include <$qt_direct_test_header>],
+         $qt_direct_test_main,
+       [
diff --git a/debian/patches/series b/debian/patches/series
index 9208253..ee1845a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ security-fix.patch
 spell.patch
 python3.patch
 compile-fixes.patch
+qt5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git