diff options
| -rwxr-xr-x | qt5-qmake/tuxboot/DEPENDS (renamed from utils/tuxboot/DEPENDS) | 4 | ||||
| -rwxr-xr-x | qt5-qmake/tuxboot/DETAILS (renamed from utils/tuxboot/DETAILS) | 2 | ||||
| -rw-r--r-- | qt5-qmake/tuxboot/HISTORY | 8 | ||||
| -rwxr-xr-x | qt5-qmake/tuxboot/INSTALL (renamed from utils/tuxboot/INSTALL) | 0 | ||||
| -rwxr-xr-x | qt5-qmake/tuxboot/PRE_BUILD | 3 | ||||
| -rw-r--r-- | qt5-qmake/tuxboot/patches/0001-build-with-qt5.patch | 97 | ||||
| -rwxr-xr-x | utils/tuxboot/BUILD | 1 | ||||
| -rw-r--r-- | utils/tuxboot/HISTORY | 2 | ||||
| -rwxr-xr-x | utils/tuxboot/PRE_BUILD | 9 |
9 files changed, 112 insertions, 14 deletions
diff --git a/utils/tuxboot/DEPENDS b/qt5-qmake/tuxboot/DEPENDS index 728d1eef00..18a4b74d77 100755 --- a/utils/tuxboot/DEPENDS +++ b/qt5-qmake/tuxboot/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/tuxboot/DETAILS b/qt5-qmake/tuxboot/DETAILS index 2bd54e64a0..cca860757a 100755 --- a/utils/tuxboot/DETAILS +++ b/qt5-qmake/tuxboot/DETAILS @@ -3,7 +3,7 @@ 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" +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE="http://tuxboot.org/" LICENSE[0]="GPL" ENTERED=20150910 diff --git a/qt5-qmake/tuxboot/HISTORY b/qt5-qmake/tuxboot/HISTORY new file mode 100644 index 0000000000..917648ea3e --- /dev/null +++ b/qt5-qmake/tuxboot/HISTORY @@ -0,0 +1,8 @@ +2019-01-05 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD: apply patch + * patches/*: added + * BUILD: deleted + * DEPENDS: qt5 stuff + +2015-09-10 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created diff --git a/utils/tuxboot/INSTALL b/qt5-qmake/tuxboot/INSTALL index 34ab88ed39..34ab88ed39 100755 --- a/utils/tuxboot/INSTALL +++ b/qt5-qmake/tuxboot/INSTALL diff --git a/qt5-qmake/tuxboot/PRE_BUILD b/qt5-qmake/tuxboot/PRE_BUILD new file mode 100755 index 0000000000..922c0ab256 --- /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 0000000000..59490974a6 --- /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@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 eec3de4651..0000000000 --- a/utils/tuxboot/BUILD +++ /dev/null @@ -1 +0,0 @@ -qt4_build diff --git a/utils/tuxboot/HISTORY b/utils/tuxboot/HISTORY deleted file mode 100644 index 4d9625a2ad..0000000000 --- a/utils/tuxboot/HISTORY +++ /dev/null @@ -1,2 +0,0 @@ -2015-09-10 Ismael Luceno <ismael@sourcemage.org> - * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created diff --git a/utils/tuxboot/PRE_BUILD b/utils/tuxboot/PRE_BUILD deleted file mode 100755 index 00754506e5..0000000000 --- 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 |