Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 editors/nano/DETAILS       |    2 +-
 editors/nano/HISTORY       |    3 +++
 utils/unetbootin/BUILD     |    2 +-
 utils/unetbootin/DEPENDS   |    4 +++-
 utils/unetbootin/HISTORY   |    3 +++
 utils/unetbootin/PRE_BUILD |   12 ++++++++++--
 6 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit f16c8cde7158e257a930b5c819b5f1cffaf2052b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    nano: => 4.0

commit 09db754a8acf4979d1d6f0f3540b9f5a40f74c68
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    unetbootin - convert to qt5

diff --git a/editors/nano/DETAILS b/editors/nano/DETAILS
index bb219d7..4f10a7c 100755
--- a/editors/nano/DETAILS
+++ b/editors/nano/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nano
-         VERSION=3.2
+         VERSION=4.0
   SECURITY_PATCH=1
           BRANCH=`echo $VERSION | cut -d . -f 1`
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/editors/nano/HISTORY b/editors/nano/HISTORY
index 90ddaf7..545d6ee 100644
--- a/editors/nano/HISTORY
+++ b/editors/nano/HISTORY
@@ -1,3 +1,6 @@
+2019-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.0
+
 2018-11-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.2
 
diff --git a/utils/unetbootin/BUILD b/utils/unetbootin/BUILD
index 260634d..6ce57ce 100755
--- a/utils/unetbootin/BUILD
+++ b/utils/unetbootin/BUILD
@@ -1,2 +1,2 @@
 cd "$SOURCE_DIRECTORY"/src/unetbootin &&
-qt4_build
+qt5_build
diff --git a/utils/unetbootin/DEPENDS b/utils/unetbootin/DEPENDS
index 00a5640..341b848 100755
--- a/utils/unetbootin/DEPENDS
+++ b/utils/unetbootin/DEPENDS
@@ -1,5 +1,7 @@
 depends -sub CXX gcc &&
-depends qt4 &&
+depends qtbase &&
+depends qtftp  &&
+depends qthttp &&
 depends mtools &&
 depends syslinux &&
 depends p7zip 
diff --git a/utils/unetbootin/HISTORY b/utils/unetbootin/HISTORY
index 82ae556..37cf26d 100644
--- a/utils/unetbootin/HISTORY
+++ b/utils/unetbootin/HISTORY
@@ -1,3 +1,6 @@
+2019-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+       *DEPENDS BUILD PRE_BUILD: convert to use qt5
+
 2018-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD, BUILD, INSTALL: version 661
 
diff --git a/utils/unetbootin/PRE_BUILD b/utils/unetbootin/PRE_BUILD
index d772c81..ae8251c 100755
--- a/utils/unetbootin/PRE_BUILD
+++ b/utils/unetbootin/PRE_BUILD
@@ -1,3 +1,4 @@
+PATH+=":$QT5DIR/bin" &&
 default_pre_build                     &&
 cd "$SOURCE_DIRECTORY"/src/unetbootin &&
 
@@ -7,5 +8,12 @@ echo "CONFIG += silent" >> ${SPELL}.pro &&
 echo "DEFINES += NOSTATIC" >> ${SPELL}.pro &&
 echo "RESOURCES -= unetbootin.qrc" >> ${SPELL}.pro &&
 
-$QT4DIR/bin/lupdate ${SPELL}.pro &&
-$QT4DIR/bin/lrelease ${SPELL}.pro
+# convert to use qt5
+lupdate ${SPELL}.pro &&
+lrelease ${SPELL}.pro &&
+sed -i 's/core/core widgets ftp http/' ${SPELL}.pro &&
+sed -i 's/QtGui/QtWidgets/;/QtWidgets/ a\
+#include <QtFtp>\n\
+#include <QtHttp>
+' unetbootin.h &&
+sed -i 's/toAscii/toLatin1/' *.cpp