[silo-llnl] 65/96: Build with qt5 ; need to specify paths

[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 360d9eaa52f087d8da673248f8098db7660da1b9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Mar 6 06:24:55 2014 +0000

    Build with qt5 ; need to specify paths
---
 debian/changelog | 1 -
 debian/rules     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d247d0e..a6b195c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ silo-llnl (4.9.1-1) UNRELEASED; urgency=low
   * Now set debhelper dependency to 9. 
   * Patch for typo spotted by Lintian.
   * Add Python3 support
-  * Update qt version support patch for 4.8.4+
   * Now use xz compression.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 21 Jun 2013 17:06:45 +0100
diff --git a/debian/rules b/debian/rules
index 1b3b075..2c33dd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS="$(CFLAGS)"
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt5 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS="$(CFLAGS)"
 
 override_dh_auto_build:
 	dh_auto_build
@@ -34,7 +34,7 @@ override_dh_auto_build:
 		 LDFLAGS=" -Wl,--as-needed $(LDFLAGS)" dh_auto_configure -- \
 			--enable-pythonmodule --enable-silex \
 			--with-qt=/usr --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib \
-			--with-qt-include=/usr/include/qt4 \
+			--with-qt-include=/usr/include/qt5 \
 			 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC)  CFLAGS="$(CFLAGS)" ; \
 		$(MAKE) -C tools/browser CXX=$(CC) ; \
 		$(MAKE) -C tools/python ; \

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