sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (29330145df1aba122831bd424e1ba8eeac92c50f)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (29330145df1aba122831bd424e1ba8eeac92c50f)
- Date: Sun, 6 Jan 2019 09:01:39 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3
qt5-qmake/qtftp/HISTORY | 3
qt5-qmake/qtftp/PRE_BUILD | 3
qt5-qmake/qthttp/HISTORY | 3
qt5-qmake/qthttp/PRE_BUILD | 3
qt5-qmake/qupzilla/BUILD | 1
qt5-qmake/qupzilla/CONFLICTS | 1
qt5-qmake/qupzilla/DETAILS | 8 -
qt5-qmake/qupzilla/DOWNLOAD | 1
qt5-qmake/qupzilla/HISTORY | 4
qt5-qmake/qupzilla/INSTALL | 1
qt5-qmake/qupzilla/PRE_BUILD | 1
qt5-qmake/qupzilla/UP_TRIGGERS | 1
qt5-qmake/tuxboot/DEPENDS | 7 +
qt5-qmake/tuxboot/DETAILS | 22 ++++
qt5-qmake/tuxboot/HISTORY | 8 +
qt5-qmake/tuxboot/INSTALL | 2
qt5-qmake/tuxboot/PRE_BUILD | 3
qt5-qmake/tuxboot/patches/0001-build-with-qt5.patch | 97
++++++++++++++++++++
utils/tuxboot/BUILD | 1
utils/tuxboot/DEPENDS | 5 -
utils/tuxboot/DETAILS | 22 ----
utils/tuxboot/HISTORY | 2
utils/tuxboot/INSTALL | 2
utils/tuxboot/PRE_BUILD | 9 -
25 files changed, 154 insertions(+), 59 deletions(-)
New commits:
commit 29330145df1aba122831bd424e1ba8eeac92c50f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
tuxboot - build with qt-5.12
commit 70656394ee4a0bff192e635cb33350f150d95a06
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtftp - buildwith qt-5.12
commit b873fced0d053683997634f6bcb9618c31dd1672
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qthttp - buildwith qt-5.12
commit 038ade09ed07b8a9885ab774cbeb71b795f7734b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
deprecate qt5-qmake/qupzilla [replaced by falkon]
diff --git a/ChangeLog b/ChangeLog
index 2b5bc53..1704082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt5-qmake/qupzilla: spell deprecated [replaced by falkon]
+
2019-01-04 Pavel Vinogradov <public AT sourcemage.org>
* gnu.gpg: added new key, A2670428, Tim Rühsen <tim.ruehsen AT gmx.de>
diff --git a/qt5-qmake/qtftp/HISTORY b/qt5-qmake/qtftp/HISTORY
index 64ea6c1..790ed8b 100644
--- a/qt5-qmake/qtftp/HISTORY
+++ b/qt5-qmake/qtftp/HISTORY
@@ -1,3 +1,6 @@
+2019-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: added, build with qt-5.12
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/qt5-qmake/qtftp/PRE_BUILD b/qt5-qmake/qtftp/PRE_BUILD
new file mode 100755
index 0000000..fc49574
--- /dev/null
+++ b/qt5-qmake/qtftp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+mkdir -p tests/auto/cmake
diff --git a/qt5-qmake/qthttp/HISTORY b/qt5-qmake/qthttp/HISTORY
index 64ea6c1..790ed8b 100644
--- a/qt5-qmake/qthttp/HISTORY
+++ b/qt5-qmake/qthttp/HISTORY
@@ -1,3 +1,6 @@
+2019-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: added, build with qt-5.12
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/qt5-qmake/qthttp/PRE_BUILD b/qt5-qmake/qthttp/PRE_BUILD
new file mode 100755
index 0000000..fc49574
--- /dev/null
+++ b/qt5-qmake/qthttp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+mkdir -p tests/auto/cmake
diff --git a/qt5-qmake/qupzilla/BUILD b/qt5-qmake/qupzilla/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5-qmake/qupzilla/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5-qmake/qupzilla/CONFLICTS b/qt5-qmake/qupzilla/CONFLICTS
deleted file mode 100755
index 53b1b97..0000000
--- a/qt5-qmake/qupzilla/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qupzilla y
diff --git a/qt5-qmake/qupzilla/DETAILS b/qt5-qmake/qupzilla/DETAILS
deleted file mode 100755
index e0a3ef0..0000000
--- a/qt5-qmake/qupzilla/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
- SPELL=qupzilla
- VERSION=0
- PATCHLEVEL=9999
- SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by falkon]
-EOF
-
diff --git a/qt5-qmake/qupzilla/DOWNLOAD b/qt5-qmake/qupzilla/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5-qmake/qupzilla/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5-qmake/qupzilla/HISTORY b/qt5-qmake/qupzilla/HISTORY
deleted file mode 100644
index c9ca3dd..0000000
--- a/qt5-qmake/qupzilla/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2018-02-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0
- PATCHLEVEL=9999
- spell deprecated [replaced by falkon]
diff --git a/qt5-qmake/qupzilla/INSTALL b/qt5-qmake/qupzilla/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5-qmake/qupzilla/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5-qmake/qupzilla/PRE_BUILD b/qt5-qmake/qupzilla/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5-qmake/qupzilla/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5-qmake/qupzilla/UP_TRIGGERS b/qt5-qmake/qupzilla/UP_TRIGGERS
deleted file mode 100755
index 4445561..0000000
--- a/qt5-qmake/qupzilla/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger falkon cast_self
diff --git a/qt5-qmake/tuxboot/DEPENDS b/qt5-qmake/tuxboot/DEPENDS
new file mode 100755
index 0000000..18a4b74
--- /dev/null
+++ b/qt5-qmake/tuxboot/DEPENDS
@@ -0,0 +1,7 @@
+depends -sub CXX gcc &&
+depends qtbase &&
+depends qtftp &&
+depends qthttp &&
+depends mtools &&
+depends syslinux &&
+depends p7zip
diff --git a/qt5-qmake/tuxboot/DETAILS b/qt5-qmake/tuxboot/DETAILS
new file mode 100755
index 0000000..cca8607
--- /dev/null
+++ b/qt5-qmake/tuxboot/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=tuxboot
+ VERSION=0.8
+ SOURCE="$SPELL-$VERSION.src.tar.gz"
+
SOURCE_URL[0]="http://downloads.sourceforge.net/sourceforge/project/$SPELL/$VERSION/source/$SOURCE";
+
SOURCE_HASH=sha512:2f6402fa850760c5c05ca14587957e88da85c9c836058a13c7baee9c8df15f78a7216fe88b77a71d30182506cbe520de5a447531860234d5676e6a3c4213bd8e
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://tuxboot.org/";
+ LICENSE[0]="GPL"
+ ENTERED=20150910
+ KEYWORDS=""
+ SHORT="To create bootable Live USB drives"
+cat << EOF
+Tuxboot helps you to create a bootable Live USB drive for Clonezilla live,
+DRBL live, GParted live and Tux2live. It is modified from UNetbootin and
+runs on both MS Windows and GNU/Linux. You can choose to download the latest
+version of Clonezilla live, DRBL live, or GParted live ISO/zip file then
+create the live USB. Features:
+
+Support Clonezilla live, DRBL live, GParted live and Tux2live. Tuxboot uses
+the syslinux in the ISO/zip file to make your USB drive bootable, so it is
+compatible with the same version of syslinux boot menu in the ISO/zip file.
+EOF
diff --git a/qt5-qmake/tuxboot/HISTORY b/qt5-qmake/tuxboot/HISTORY
new file mode 100644
index 0000000..917648e
--- /dev/null
+++ b/qt5-qmake/tuxboot/HISTORY
@@ -0,0 +1,8 @@
+2019-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: apply patch
+ * patches/*: added
+ * BUILD: deleted
+ * DEPENDS: qt5 stuff
+
+2015-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/qt5-qmake/tuxboot/INSTALL b/qt5-qmake/tuxboot/INSTALL
new file mode 100755
index 0000000..34ab88e
--- /dev/null
+++ b/qt5-qmake/tuxboot/INSTALL
@@ -0,0 +1,2 @@
+install -m755 -o root -g root ${SOURCE_DIRECTORY}/${SPELL} \
+ ${INSTALL_ROOT}/usr/bin
diff --git a/qt5-qmake/tuxboot/PRE_BUILD b/qt5-qmake/tuxboot/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/qt5-qmake/tuxboot/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt5-qmake/tuxboot/patches/0001-build-with-qt5.patch
b/qt5-qmake/tuxboot/patches/0001-build-with-qt5.patch
new file mode 100644
index 0000000..5949097
--- /dev/null
+++ b/qt5-qmake/tuxboot/patches/0001-build-with-qt5.patch
@@ -0,0 +1,97 @@
+From d3f43ead38eac2a1ca2542b73c2e8615bc1067f5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 5 Jan 2019 21:34:09 +0100
+Subject: [PATCH] build with qt5
+
+---
+ tuxboot.cpp | 4 ++--
+ tuxboot.h | 16 ++++++++++++----
+ tuxboot.pro | 13 ++++++-------
+ 3 files changed, 20 insertions(+), 13 deletions(-)
+
+diff --git a/tuxboot.cpp b/tuxboot.cpp
+index 896246b..18bd4d4 100644
+--- a/tuxboot.cpp
++++ b/tuxboot.cpp
+@@ -2897,11 +2897,11 @@ int tuxboot::letterToNumber(QChar lettertoconvert)
+ {
+ if (lettertoconvert.isLower())
+ {
+- return static_cast<int>(lettertoconvert.toAscii() - 'a');
++ return static_cast<int>(lettertoconvert.toLatin1() - 'a');
+ }
+ if (lettertoconvert.isUpper())
+ {
+- return static_cast<int>(lettertoconvert.toAscii() - 'A');
++ return static_cast<int>(lettertoconvert.toLatin1() - 'A');
+ }
+ else
+ {
+diff --git a/tuxboot.h b/tuxboot.h
+index 1cdc958..cb327b7 100644
+--- a/tuxboot.h
++++ b/tuxboot.h
+@@ -10,12 +10,20 @@ This program is distributed in the hope that it will be
useful, but WITHOUT ANY
+ #ifndef tuxboot_H
+ #define tuxboot_H
+
+-#include <QtCore>
+-#include <QtGui>
+-#include <QtNetwork>
++#include <QMessageBox>
+ #include <time.h>
++#include <QDir>
+ #include <QFile>
+-//#include <QtDebug>
++#include <QFileDialog>
++#include <QProcess>
++#include <QProgressDialog>
++#include <QSettings>
++#include <QThread>
++#include <QTextStream>
++#include <QTranslator>
++
++#include <QtFtp>
++#include <QtHttp>
+
+ #include "ui_tuxboot.h"
+ #include "version.h"
+diff --git a/tuxboot.pro b/tuxboot.pro
+index 8ff20d0..5dd9001 100644
+--- a/tuxboot.pro
++++ b/tuxboot.pro
+@@ -8,7 +8,7 @@ QMAKE_LFLAGS_RELEASE += -Wl,-z,relro
+ }
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-CONFIG += release static
++CONFIG += release shared
+ HEADERS += tuxboot.h
+ FORMS += tuxboot.ui
+ SOURCES += main.cpp \
+@@ -16,8 +16,11 @@ SOURCES += main.cpp \
+ distrolst.cpp \
+ distrover.cpp
+ QT += core \
++ ftp \
++ http \
+ gui \
+- network
++ network \
++ widgets
+ TRANSLATIONS += i18n/tuxboot.ts \
+ i18n/tuxboot_am.ts \
+ i18n/tuxboot_ar.ts \
+@@ -62,8 +65,4 @@ TRANSLATIONS += i18n/tuxboot.ts \
+ i18n/tuxboot_sl.ts \
+ i18n/tuxboot_sv.ts \
+ i18n/tuxboot_pl.ts
+-RESOURCES += tuxboot.qrc
+-win32 {
+- RESOURCES += tuxboot-windows.qrc
+- RC_FILE = embedfiles/tuxboot-win.rc
+-}
++DEFINES += NOSTATIC
+--
+2.20.1
+
diff --git a/utils/tuxboot/BUILD b/utils/tuxboot/BUILD
deleted file mode 100755
index eec3de4..0000000
--- a/utils/tuxboot/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-qt4_build
diff --git a/utils/tuxboot/DEPENDS b/utils/tuxboot/DEPENDS
deleted file mode 100755
index 728d1ee..0000000
--- a/utils/tuxboot/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends -sub CXX gcc &&
-depends qt4 &&
-depends mtools &&
-depends syslinux &&
-depends p7zip
diff --git a/utils/tuxboot/DETAILS b/utils/tuxboot/DETAILS
deleted file mode 100755
index 2bd54e6..0000000
--- a/utils/tuxboot/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
- SPELL=tuxboot
- VERSION=0.8
- SOURCE="$SPELL-$VERSION.src.tar.gz"
-
SOURCE_URL[0]="http://downloads.sourceforge.net/sourceforge/project/$SPELL/$VERSION/source/$SOURCE";
-
SOURCE_HASH=sha512:2f6402fa850760c5c05ca14587957e88da85c9c836058a13c7baee9c8df15f78a7216fe88b77a71d30182506cbe520de5a447531860234d5676e6a3c4213bd8e
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
- WEB_SITE="http://tuxboot.org/";
- LICENSE[0]="GPL"
- ENTERED=20150910
- KEYWORDS=""
- SHORT="To create bootable Live USB drives"
-cat << EOF
-Tuxboot helps you to create a bootable Live USB drive for Clonezilla live,
-DRBL live, GParted live and Tux2live. It is modified from UNetbootin and
-runs on both MS Windows and GNU/Linux. You can choose to download the latest
-version of Clonezilla live, DRBL live, or GParted live ISO/zip file then
-create the live USB. Features:
-
-Support Clonezilla live, DRBL live, GParted live and Tux2live. Tuxboot uses
-the syslinux in the ISO/zip file to make your USB drive bootable, so it is
-compatible with the same version of syslinux boot menu in the ISO/zip file.
-EOF
diff --git a/utils/tuxboot/HISTORY b/utils/tuxboot/HISTORY
deleted file mode 100644
index 4d9625a..0000000
--- a/utils/tuxboot/HISTORY
+++ /dev/null
@@ -1,2 +0,0 @@
-2015-09-10 Ismael Luceno <ismael AT sourcemage.org>
- * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/utils/tuxboot/INSTALL b/utils/tuxboot/INSTALL
deleted file mode 100755
index 34ab88e..0000000
--- a/utils/tuxboot/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-install -m755 -o root -g root ${SOURCE_DIRECTORY}/${SPELL} \
- ${INSTALL_ROOT}/usr/bin
diff --git a/utils/tuxboot/PRE_BUILD b/utils/tuxboot/PRE_BUILD
deleted file mode 100755
index 0075450..0000000
--- a/utils/tuxboot/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-echo "QMAKE_CXX=${CXX:-g++}" >> ${SPELL}.pro &&
-echo "QMAKE_CXXFLAGS=${CXXFLAGS}" >> ${SPELL}.pro &&
-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
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (29330145df1aba122831bd424e1ba8eeac92c50f), Treeve Jelbert, 01/06/2019
Archive powered by MHonArc 2.6.24.