sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (2ea435dd292547be38309ebc22c3cb93633dd688)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2ea435dd292547be38309ebc22c3cb93633dd688)
Date: Thu, 18 Jan 2018 04:24:24 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

graphics/djview4/BUILD | 6 +++++-
graphics/djview4/DEPENDS | 4 ++--
graphics/djview4/HISTORY | 3 +++
3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 2ea435dd292547be38309ebc22c3cb93633dd688
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

djview4: Fix build against Qt 5

diff --git a/graphics/djview4/BUILD b/graphics/djview4/BUILD
index 9af7747..c4fcf34 100755
--- a/graphics/djview4/BUILD
+++ b/graphics/djview4/BUILD
@@ -1,4 +1,8 @@
-export QTDIR=$QT4DIR &&
+if is_depends_enabled $SPELL qt4; then
+ export QTDIR="$QT4DIR"
+else
+ export QTDIR="$QT5DIR"
+fi &&
export PATH="$QTDIR/bin:$PATH" &&
export QMAKE="$QTDIR/bin/qmake" &&
default_build
diff --git a/graphics/djview4/DEPENDS b/graphics/djview4/DEPENDS
index 595d36d..719b8c0 100755
--- a/graphics/djview4/DEPENDS
+++ b/graphics/djview4/DEPENDS
@@ -1,5 +1,5 @@
depends -sub CXX gcc &&
-depends pkgconfig &&
-depends qt4 &&
+depends pkgconfig &&
+depends QT &&
depends djvulibre

diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY
index 5512ef1..1bb1a87 100644
--- a/graphics/djview4/HISTORY
+++ b/graphics/djview4/HISTORY
@@ -1,3 +1,6 @@
+2018-01-18 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS: fixed build against Qt 5
+
2016-03-09 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 4.10.6

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (2ea435dd292547be38309ebc22c3cb93633dd688), Ismael Luceno, 01/17/2018