Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 FUNCTIONS                |    4 ++--
 editors/texmaker/BUILD   |   10 +++++-----
 editors/texmaker/DEPENDS |   12 +++++++++---
 editors/texmaker/DETAILS |    4 ++--
 editors/texmaker/HISTORY |    4 ++++
 editors/texworks/BUILD   |    6 +++++-
 editors/texworks/DEPENDS |    3 +--
 editors/texworks/DETAILS |    4 ++--
 editors/texworks/HISTORY |    4 ++++
 9 files changed, 34 insertions(+), 17 deletions(-)

New commits:
commit 680b9bd25aa5f803b04d4e082eac935056eb5cc5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texmaker 5.0.2

commit ebc5f64922f830c976bd8ca444f4220114809252
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texworks 0.6.2

commit 91c495172f45c66b492732434a125b564e4f5492
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    FUNCTIONS: Generalize qt[45]_build install dir
    
    Take the installation directory as first argument.

diff --git a/FUNCTIONS b/FUNCTIONS
index 30a1d3d..fc2bd21 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -17,7 +17,7 @@ qt5_build() {
 function qt5_cmake_build() {
   PATH="$QT5DIR/bin/:$PATH"
   export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
-  cmake_build $QT5DIR
+  cmake_build ${1-$QT5DIR}
 }
 
 
@@ -605,7 +605,7 @@ function cmake_install() {
 qt4_cmake_build() {
   PATH="$QT4DIR/bin/:$PATH"
   export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
-  cmake_build $QT4DIR
+  cmake_build ${1-$QT4DIR}
 }
 
 qt4_build() {
diff --git a/editors/texmaker/BUILD b/editors/texmaker/BUILD
index dd4cb7a..cb0b4d7 100755
--- a/editors/texmaker/BUILD
+++ b/editors/texmaker/BUILD
@@ -1,5 +1,5 @@
-PATH=$QT4DIR/bin:${PATH}
-LD_LIBRARY_PATH=/usr/lib/qt4:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=/usr/lib/qt4:$DYLD_LIBRARY_PATH
-qmake -unix PREFIX=${INSTALL_ROOT}/usr texmaker.pro &&
-make
+if is_depends_enabled $SPELL qtbase; then
+  qt5_build
+else
+  qt4_build
+fi
diff --git a/editors/texmaker/DEPENDS b/editors/texmaker/DEPENDS
index 91907a8..0a92cd5 100755
--- a/editors/texmaker/DEPENDS
+++ b/editors/texmaker/DEPENDS
@@ -1,3 +1,9 @@
-depends -sub SQLITE qt4  &&
-depends -sub QT4 poppler &&
-depends -sub CXX gcc
+depends QT &&
+depends poppler &&
+if is_depends_enabled $SPELL qtbase; then
+  sub_depends qtbase SQLITE &&
+  sub_depends poppler QT5
+else
+  sub_depends qt4 SQLITE &&
+  sub_depends poppler QT4
+fi
diff --git a/editors/texmaker/DETAILS b/editors/texmaker/DETAILS
index 834e8f0..4378b2d 100755
--- a/editors/texmaker/DETAILS
+++ b/editors/texmaker/DETAILS
@@ -1,8 +1,8 @@
            SPELL=texmaker
-         VERSION=4.5
+         VERSION=5.0.2
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://www.xm1math.net/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11
+     
SOURCE_HASH=sha512:07c57d9a7c479cd822a2cdd23d1e2653080b043ce2a411c63345807e790b5a0fe3861f4b14a798606a06aa515a54501f7d8eb0de6086a4257a570915cdeec751
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.xm1math.net/texmaker";
       LICENSE[0]=GPL
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index 53c9842..e8c5ef7 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,3 +1,7 @@
+2017-12-22 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 5.0.2
+       * BUILD, DEPENDS: Qt 5 support added
+
 2016-12-24 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 4.5
 
diff --git a/editors/texworks/BUILD b/editors/texworks/BUILD
index 2113434..156ffa6 100755
--- a/editors/texworks/BUILD
+++ b/editors/texworks/BUILD
@@ -1 +1,5 @@
-qt4_cmake_build
+if is_depends_enabled $SPELL qtbase; then
+  qt5_cmake_build "$INSTALL_ROOT/usr"
+else
+  qt4_cmake_build "$INSTALL_ROOT/usr"
+fi
diff --git a/editors/texworks/DEPENDS b/editors/texworks/DEPENDS
index b64ff3a..60f017d 100755
--- a/editors/texworks/DEPENDS
+++ b/editors/texworks/DEPENDS
@@ -1,8 +1,7 @@
-depends -sub CXX gcc &&
 depends hunspell     &&
 depends LUA          &&
 depends poppler      &&
 depends python3      &&
-depends qt4          &&
+depends QT           &&
 depends texlive      &&
 depends zlib
diff --git a/editors/texworks/DETAILS b/editors/texworks/DETAILS
index 712c6f1..38f4b3c 100755
--- a/editors/texworks/DETAILS
+++ b/editors/texworks/DETAILS
@@ -1,8 +1,8 @@
            SPELL=texworks
-         VERSION=0.6.1
+         VERSION=0.6.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    
SOURCE_URL[0]=https://github.com/TeXworks/$SPELL/archive/release-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:e322524aee2f5c07279e0e2373d2bc86b6772455aa957bf27b1a869e56f44f3278e85f0ab9f311a979818e7b81b0faed59bed5ed357f20b86a6e73e4ced8c027
+     
SOURCE_HASH=sha512:cf81fe9a8db06cde25b67a27c310127b09013fe47cf7fa57bcb7df5d1054dea77cc6ff142af24eae89b216127d34a07db84f0d4ccc92cbdb6bebfc9949b3b148
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-release-$VERSION"
         WEB_SITE="http://www.tug.org/texworks/";
       LICENSE[0]=GPL
diff --git a/editors/texworks/HISTORY b/editors/texworks/HISTORY
index f0d8b7a..72512f6 100644
--- a/editors/texworks/HISTORY
+++ b/editors/texworks/HISTORY
@@ -1,3 +1,7 @@
+2017-12-22 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 0.6.2
+       * BUILD, DEPENDS: Qt 5 support added
+
 2016-12-24 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 0.6.1