diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-03-22 13:37:04 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-03-22 13:37:04 +0000 |
| commit | 15ac17477444458be07f24d584b47b5d6272abf6 (patch) | |
| tree | 23ea7225a322ad3d1ade35014c0e6e6570571237 /sysutils/unetbootin/files/patch-main.cpp | |
| parent | grpahics/drm-current-kmod: Update snapshot (diff) | |
- Resurrect and apply unofficial patch from Gentoo to build against
Qt version 5 (this breaks unetbootin::lstFtpDirFiles() due to
https://bugreports.qt.io/browse/QTBUG-26294)
- Comment out all sources that require FTP LIST command
- Don't wait until file is fully downloaded before dumping it on disk
- Fix some QNetworkReply/QFile resource freeing bugs
- Delete unetbootin::dlprogressupdate64() because it's never used
- Fix some slot warnings while here
Patches by: Valeriy Malov <jazzvoid@gmail.com>
Obtained from: https://bugs.gentoo.org/show_bug.cgi?id=644360
Diffstat (limited to 'sysutils/unetbootin/files/patch-main.cpp')
| -rw-r--r-- | sysutils/unetbootin/files/patch-main.cpp | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/sysutils/unetbootin/files/patch-main.cpp b/sysutils/unetbootin/files/patch-main.cpp new file mode 100644 index 000000000000..9feb8efa68d4 --- /dev/null +++ b/sysutils/unetbootin/files/patch-main.cpp @@ -0,0 +1,70 @@ +--- main.cpp.orig 2016-05-16 08:57:42 UTC ++++ main.cpp +@@ -9,6 +9,8 @@ This program is distributed in the hope that it will b + + #include "unetbootin.h" + ++#include <QMessageBox> ++ + #ifdef Q_OS_WIN32 + + void configsysUndo(QString uninstPathL) +@@ -292,9 +294,9 @@ int main(int argc, char **argv) + } + argsconc += "\"rootcheck=no\""; + argsconcSingleQuote += "'rootcheck=no'"; +-#ifdef Q_OS_LINUX ++#ifdef Q_OS_UNIX + QString gksuarg1; +- gksuarg1 += QString("bash -c 'QT_X11_NO_MITSHM=1 "); ++ gksuarg1 += QString("sh -c 'QT_X11_NO_MITSHM=1 "); + gksuarg1 += QString("%1 %2").arg(app.applicationFilePath()).arg(argsconc); + gksuarg1 += QString("'"); + QStringList gksuargs; +@@ -370,7 +372,7 @@ int main(int argc, char **argv) + #ifdef Q_OS_WIN32 + QSettings chkinst("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\UNetbootin", QSettings::NativeFormat); + #endif +- #ifdef Q_OS_LINUX ++ #ifdef Q_OS_UNIX + QSettings chkinst(QSettings::SystemScope, "UNetbootin"); + #endif + #ifndef Q_OS_MAC +@@ -380,18 +382,16 @@ int main(int argc, char **argv) + uninstmsgb.setIcon(QMessageBox::Information); + uninstmsgb.setWindowTitle(uninstaller::tr("%1 Uninstaller").arg(UNETBOOTINB)); + uninstmsgb.setText(uninstaller::tr("%1 is currently installed. Remove the existing version?").arg(UNETBOOTINB)); +- uninstmsgb.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); +- switch (uninstmsgb.exec()) +- { +- case QMessageBox::Ok: +- { +- ubnUninst(); +- } +- case QMessageBox::Cancel: +- break; +- default: +- break; +- } ++ uninstmsgb.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); ++ switch (uninstmsgb.exec()) ++ { ++ case QMessageBox::Ok: ++ ubnUninst(); ++ break; ++ case QMessageBox::Cancel: ++ default: ++ break; ++ } + return 0; + } + #endif +@@ -405,7 +405,7 @@ int main(int argc, char **argv) + icon.addFile(":/unetbootin_24.png", QSize(24,24)); + icon.addFile(":/unetbootin_32.png", QSize(32,32)); + icon.addFile(":/unetbootin_48.png", QSize(48,48)); +-#ifdef Q_OS_LINUX ++#ifdef Q_OS_UNIX + icon.addFile("/usr/share/pixmaps/unetbootin.png"); + icon.addFile("/usr/share/pixmaps/unetbootin.xpm"); + #endif |