Hello community,
here is the log from the commit of package unetbootin for openSUSE:Factory
checked in at 2016-07-01 09:59:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unetbootin (Old)
and /work/SRC/openSUSE:Factory/.unetbootin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unetbootin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/unetbootin/unetbootin.changes 2015-12-09
22:35:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.unetbootin.new/unetbootin.changes
2016-07-01 10:00:00.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Jun 28 17:05:35 UTC 2016 - ch...@computersalat.de
+
+- rebase patches
+- fix changelog
+
+-------------------------------------------------------------------
+Wed Jun 22 10:55:16 UTC 2016 - ec...@opensuse.org
+
+- change selectable openSUSE versions only to supported versions:
+ 13.1, 13.2, Leap_42.1, Tumbleweed, Factory
+- change my old email to the new one in previous changes
+
+-------------------------------------------------------------------
+Mon Jun 20 08:37:19 UTC 2016 - joerg.loren...@ki.tng.de
+
+- update to revision 625
+
+-------------------------------------------------------------------
@@ -33 +51 @@
-Sun Sep 7 09:44:14 UTC 2014 - ec...@schirra.net
+Sun Sep 7 09:44:14 UTC 2014 - ec...@opensuse.org
@@ -35 +53 @@
-- update to 6.0.8
+- update to 608
@@ -38 +56 @@
-Mon May 5 15:25:53 UTC 2014 - ec...@schirra.net
+Mon May 5 15:25:53 UTC 2014 - ec...@opensuse.org
@@ -40 +58 @@
-- update to 6.0.3
+- update to 603
Old:
----
unetbootin-source-613.tar.gz
New:
----
unetbootin-source-625.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unetbootin.spec ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package unetbootin
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%define rev 613
+%define rev 625
Name: unetbootin
Summary: Universal Netboot Installer
@@ -42,9 +42,6 @@
Requires: udev
Requires: util-linux
Requires: xdg-utils
-%if 0%{?suse_version} == 1230
-BuildRequires: libjpeg8-devel
-%endif
%description
UNetbootin allows for the installation of various Linux/BSD distributions
@@ -54,9 +51,9 @@
%prep
%setup -q -c -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+%patch0
+%patch1
+%patch2
# rpmlint: wrong-file-end-of-line-encoding
sed -i 's/\r$//' README.TXT
++++++ unetbootin-desktop.patch ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,21 +1,23 @@
---- unetbootin.desktop.orig 2014-04-05 08:33:20.000000000 +0200
-+++ unetbootin.desktop 2015-08-10 10:13:50.725736800 +0200
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Version=1.0
- Name=UNetbootin
-+GenericName=UNetbootin
- Comment=Tool for creating Live USB drives
--Categories=Application;System;
--Exec=/usr/bin/unetbootin
--Terminal=false
- Type=Application
--Name[en_US]=UNetbootin
--GenericName[en_US]=UNetbootin
--Comment[en_US]=Tool for creating Live USB drives
-+Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin
-+Terminal=false
- Icon=unetbootin
-+Categories=System;Filesystem;
-+X-KDE-StartupNotify=true
-+X-SuSE-translate=true
+Index: unetbootin.desktop
+===================================================================
+--- unetbootin.desktop.orig
++++ unetbootin.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Version=1.0
+ Name=UNetbootin
++GenericName=UNetbootin
+ Comment=Tool for creating Live USB drives
+-Categories=Application;System;
+-Exec=/usr/bin/unetbootin
+-Terminal=false
+ Type=Application
+-Name[en_US]=UNetbootin
+-GenericName[en_US]=UNetbootin
+-Comment[en_US]=Tool for creating Live USB drives
++Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin
++Terminal=false
+ Icon=unetbootin
++Categories=System;Filesystem;
++X-KDE-StartupNotify=true
++X-SuSE-translate=true
++++++ unetbootin-locate-usb-devices.diff ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,7 +1,7 @@
-Index: b/unetbootin.cpp
+Index: unetbootin.cpp
===================================================================
---- a/unetbootin.cpp
-+++ b/unetbootin.cpp
+--- unetbootin.cpp.orig
++++ unetbootin.cpp
@@ -575,17 +575,12 @@ QStringList unetbootin::listsanedrives()
}
#endif
++++++ unetbootin-source-613.tar.gz -> unetbootin-source-625.tar.gz ++++++
Files old/._distrolst.cpp and new/._distrolst.cpp differ
Files old/._distrover.cpp and new/._distrover.cpp differ
Files old/._main.cpp and new/._main.cpp differ
Files old/._org.unetbootin.pkexec.unetbootin.policy and
new/._org.unetbootin.pkexec.unetbootin.policy differ
Files old/._unetbootin.cpp and new/._unetbootin.cpp differ
Files old/._unetbootin.h and new/._unetbootin.h differ
Files old/._unetbootin.ui and new/._unetbootin.ui differ
Files old/._unetbootin.xpm and new/._unetbootin.xpm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.TXT new/README.TXT
--- old/README.TXT 2015-07-20 10:43:12.000000000 +0200
+++ new/README.TXT 2016-05-16 11:24:20.000000000 +0200
@@ -1,16 +1,16 @@
-UNetbootin Source Revision 613
+UNetbootin Source Revision 625
Copyright Geza Kovacs
Homepage at http://unetbootin.sourceforge.net
Licensed under the GNU GPL v2 and above, components from other projects are
licensed under their respective licenses
-Build generated on Mon Jul 20 01:43:12 PDT 2015
+Build generated on Mon May 16 02:24:20 PDT 2016
Download using git:
git clone https://github.com/gkovacs/unetbootin.git
cd unetbootin
-git checkout cbf30e41bbd2ad57f31feb29c559d6a2046f0d6c
+git checkout 807d69b20c2bd403ecd63ea4fe8cfbe5bb49ce33
Download using bzr:
-bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r613
+bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r625
Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/distrolst.cpp new/distrolst.cpp
--- old/distrolst.cpp 2015-07-20 03:05:56.000000000 +0200
+++ new/distrolst.cpp 2016-05-16 11:16:09.000000000 +0200
@@ -11,13 +11,15 @@
#define debianrelnamereplace \
relname \
.replace("unstable", "sid") \
- .replace("testing", "jessie") \
- .replace("stable", "wheezy");
+ .replace("testing", "stretch") \
+ .replace("stable", "jessie");
#endif
#ifndef ubunturelnamereplace
#define ubunturelnamereplace \
relname \
+ .replace("16.10", "yakkety") \
+ .replace("16.04", "xenial") \
.replace("15.10", "wily") \
.replace("15.04", "vivid") \
.replace("14.10", "utopic") \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/distrover.cpp new/distrover.cpp
--- old/distrover.cpp 2015-07-20 02:57:22.000000000 +0200
+++ new/distrover.cpp 2016-05-16 11:18:44.000000000 +0200
@@ -11,8 +11,8 @@
#define ubuntuverlist \
"12.04_NetInstall" << "12.04_NetInstall_x64" << "12.04_HdMedia" <<
"12.04_HdMedia_x64" << "12.04_Live" << "12.04_Live_x64" << \
"14.04_NetInstall" << "14.04_NetInstall_x64" << "14.04_HdMedia" <<
"14.04_HdMedia_x64" << "14.04_Live" << "14.04_Live_x64" << \
-"14.10_NetInstall" << "14.10_NetInstall_x64" << "14.10_HdMedia" <<
"14.10_HdMedia_x64" << "14.10_Live" << "14.10_Live_x64" << \
-"15.04_NetInstall" << "15.04_NetInstall_x64" << "15.04_HdMedia" <<
"15.04_HdMedia_x64" << "15.04_Live" << "15.04_Live_x64" << \
+"15.10_NetInstall" << "15.10_NetInstall_x64" << "15.10_HdMedia" <<
"15.10_HdMedia_x64" << "15.10_Live" << "15.10_Live_x64" << \
+"16.04_NetInstall" << "16.04_NetInstall_x64" << "16.04_HdMedia" <<
"16.04_HdMedia_x64" << "16.04_Live" << "16.04_Live_x64" << \
"Daily_Live" << "Daily_Live_x64"
#endif
@@ -125,7 +125,7 @@
"<b>Description:</b> Kaspersky Rescue Disk detects and removes malware
from your Windows installation.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which malware scans can be launched.") <<
"10_Live" << "8_Live"));
- distroselect->addItem("Kubuntu", (QStringList() << "14.04_Live" <<
+ distroselect->addItem("Kubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://www.kubuntu.org/\";>http://www.kubuntu.org</a><br/>"
"<b>Description:</b> Kubuntu is an official Ubuntu derivative featuring
the KDE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which the installer can optionally be launched. The NetInstall
version allows for installation over FTP, and can install Kubuntu and other
official Ubuntu derivatives. If you would like to use a pre-downloaded
alternate (not desktop) install iso, use the HdMedia option, and then place the
alternate install iso file on the root directory of your hard drive or USB
drive") <<
@@ -140,7 +140,7 @@
"<b>Description:</b> Linux Mint is a user-friendly Ubuntu-based
distribution which includes additional proprietary codecs and other software by
default.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which the installer can optionally be launched.") <<
"17_Live" << "17_Live_x64" << "17.1_Live" << "17.1_Live_x64" <<
"17.2_Live" << "17.2_Live_x64"));
-distroselect->addItem("Lubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Lubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://www.lubuntu.net/\";>http://www.lubuntu.net</a><br/>"
"<b>Description:</b> Lubuntu is an official Ubuntu derivative featuring
the LXDE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which the installer can optionally be launched. The NetInstall
version allows for installation over FTP, and can install Kubuntu and other
official Ubuntu derivatives. If you would like to use a pre-downloaded
alternate (not desktop) install iso, use the HdMedia option, and then place the
alternate install iso file on the root directory of your hard drive or USB
drive") <<
@@ -247,7 +247,7 @@
// "<b>Description:</b> SystemRescueCD includes various partition
management and data recovery and backup tools.<br/>"
// "<b>Install Notes:</b> SystemRescueCD is booted and run in live mode;
no installation is required to use it.") <<
//"Latest_Live"));
-distroselect->addItem("Ubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Ubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://www.ubuntu.com/\";>http://www.ubuntu.com</a><br/>"
"<b>Description:</b> Ubuntu is a user-friendly Debian-based
distribution. It is currently the most popular Linux desktop distribution.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which the installer can optionally be launched. The NetInstall
version allows for installation over FTP, and can install Kubuntu and other
official Ubuntu derivatives. If you would like to use a pre-downloaded
alternate (not desktop) install iso, use the HdMedia option, and then place the
alternate install iso file on the root directory of your hard drive or USB
drive") <<
@@ -257,7 +257,7 @@
"<b>Description:</b> xPUD is a lightweight distribution featuring a
simple kiosk-like interface with a web browser and media player.<br/>"
"<b>Install Notes:</b> The Live version loads the entire system into
RAM and boots from memory.") <<
"Stable_Live" << "Unstable_Live"));
-distroselect->addItem("Xubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Xubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://www.xubuntu.org/\";>http://www.xubuntu.org</a><br/>"
"<b>Description:</b> Xubuntu is an official Ubuntu derivative featuring
the XFCE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live
mode, from which the installer can optionally be launched. The NetInstall
version allows for installation over FTP, and can install Kubuntu and other
official Ubuntu derivatives. If you would like to use a pre-downloaded
alternate (not desktop) install iso, use the HdMedia option, and then place the
alternate install iso file on the root directory of your hard drive or USB
drive") <<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/main.cpp new/main.cpp
--- old/main.cpp 2014-04-22 01:20:27.000000000 +0200
+++ new/main.cpp 2016-05-16 10:57:42.000000000 +0200
@@ -293,35 +293,55 @@
argsconc += "\"rootcheck=no\"";
argsconcSingleQuote += "'rootcheck=no'";
#ifdef Q_OS_LINUX
- QString gksulocation = checkforgraphicalsu("gksu");
+ QString gksuarg1;
+ gksuarg1 += QString("bash -c 'QT_X11_NO_MITSHM=1 ");
+ gksuarg1 += QString("%1
%2").arg(app.applicationFilePath()).arg(argsconc);
+ gksuarg1 += QString("'");
+ QStringList gksuargs;
+ gksuargs.append(gksuarg1);
+
+ /*
+ QString pkexeclocation = checkforgraphicalsu("pkexec");
+ if (pkexeclocation != "REQCNOTFOUND" && app.applicationFilePath()
== "/usr/bin/unetbootin" &&
QFile::exists("/usr/share/polkit-1/actions/org.unetbootin.pkexec.unetbootin.policy"))
+ {
+ //QProcess::startDetached(QString("%1 %2
%3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(QString("%1 %2
%3").arg(pkexeclocation).arg(app.applicationFilePath()).arg(argsconc));
+ return 0;
+ }
+ */
+ QString gksulocation = checkforgraphicalsu("gksu");
if (gksulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2
%3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2
%3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(gksulocation, gksuargs);
return 0;
}
QString kdesulocation = checkforgraphicalsu("kdesu");
if (kdesulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2
%3").arg(kdesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2
%3").arg(kdesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(kdesulocation, gksuargs);
return 0;
}
QString gnomesulocation =
checkforgraphicalsu("gnomesu");
if (gnomesulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2
%3").arg(gnomesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2
%3").arg(gnomesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(gnomesulocation, gksuargs);
return 0;
}
QString kdesudolocation =
checkforgraphicalsu("kdesudo");
if (kdesudolocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2
%3").arg(kdesudolocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2
%3").arg(kdesudolocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(kdesudolocation, gksuargs);
return 0;
}
QMessageBox rootmsgb;
rootmsgb.setIcon(QMessageBox::Warning);
rootmsgb.setWindowTitle(uninstaller::tr("Must run as
root"));
rootmsgb.setTextFormat(Qt::RichText);
- rootmsgb.setText(uninstaller::tr("%2 must be run as
root. Close it, and re-run using either:<br/><b>sudo %1</b><br/>or:<br/><b>su -
-c '%1'</b>").arg(app.applicationFilePath()).arg(UNETBOOTINB));
+ rootmsgb.setText(uninstaller::tr("%2 must be run as root. Close
it, and re-run using either:<br/><b>sudo QT_X11_NO_MITSHM=1
%1</b><br/>or:<br/><b>su -c 'QT_X11_NO_MITSHM=1
%1'</b>").arg(app.applicationFilePath()).arg(UNETBOOTINB));
rootmsgb.setStandardButtons(QMessageBox::Ok);
switch (rootmsgb.exec())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/org.unetbootin.pkexec.unetbootin.policy
new/org.unetbootin.pkexec.unetbootin.policy
--- old/org.unetbootin.pkexec.unetbootin.policy 1970-01-01 01:00:00.000000000
+0100
+++ new/org.unetbootin.pkexec.unetbootin.policy 2016-05-16 10:47:38.000000000
+0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd";>
+<policyconfig>
+ <action id="org.unetbootin.pkexec.unetbootin">
+ <message>Authentication is required to run unetbootin</message>
+ <icon_name>unetbootin</icon_name>
+ <defaults>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate
key="org.freedesktop.policykit.exec.path">/usr/bin/unetbootin</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unetbootin.cpp new/unetbootin.cpp
--- old/unetbootin.cpp 2015-07-20 02:53:42.000000000 +0200
+++ new/unetbootin.cpp 2016-05-16 10:47:38.000000000 +0200
@@ -878,11 +878,6 @@
close();
}
-void unetbootin::on_frebootbutton_clicked()
-{
- sysreboot();
-}
-
QString unetbootin::displayfisize(quint64 fisize)
{
if (fisize < 10000)
@@ -990,7 +985,7 @@
overwritefilemsgbx.setIcon(QMessageBox::Warning);
overwritefilemsgbx.setWindowTitle(QString(tr("%1 is out of space, abort
installation?")).arg(destindir));
overwritefilemsgbx.setText(QString(tr("The directory %1 is out of
space. Press 'Yes' to abort installation, 'No' to ignore this error and attempt
to continue installation, and 'No to All' to ignore all out-of-space
errors.")).arg(destindir));
- overwritefilemsgbx.setStandardButtons(QMessageBox::Yes |
QMessageBox::YesToAll | QMessageBox::No);
+ overwritefilemsgbx.setStandardButtons(QMessageBox::Yes |
QMessageBox::NoToAll | QMessageBox::No);
switch (overwritefilemsgbx.exec())
{
case QMessageBox::Yes:
@@ -2718,8 +2713,6 @@
rebootlayer->setEnabled(true);
rebootlayer->show();
rebootmsgtext->setText(tr("Download of %1 %2 from %3 failed. Please try
downloading the ISO file from the website directly and supply it via the
diskimage option.").arg(nameDistro).arg(nameVersion).arg(fileurl));
- this->frebootbutton->setEnabled(false);
- this->frebootbutton->hide();
this->downloadFailed = true;
if (exitOnCompletion)
{
@@ -2910,25 +2903,6 @@
return qMakePair(hRegxMatchString, hRegxMatch);
}
-void unetbootin::sysreboot()
-{
- #ifdef Q_OS_WIN32
- HANDLE hToken;
- TOKEN_PRIVILEGES tkp;
- OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES |
TOKEN_QUERY, &hToken);
- LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid);
- tkp.PrivilegeCount = 1;
- tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
- AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL,
0);
- ExitWindowsEx(EWX_REBOOT, EWX_FORCE);
- #endif
- #ifdef Q_OS_LINUX
- callexternapp("init", "6 &");
- #endif
-#ifdef Q_OS_MAC
-callexternapp("shutdown", "-r now &");
-#endif
-}
QString unetbootin::callexternapp(QString xexecFile, QString xexecParm)
{
@@ -4324,17 +4298,15 @@
sdesc4->setText(QString("<b>%1
%2</b>").arg(sdesc4->text()).arg(trcurrent));
if (installType == tr("Hard Disk"))
{
- rebootmsgtext->setText(tr("After rebooting, select the
"UNETBOOTINB" menu entry to boot.%1\nReboot now?").arg(postinstmsg));
+ rebootmsgtext->setText(tr("After rebooting, select the
"UNETBOOTINB" menu entry to boot.%1").arg(postinstmsg));
}
if (installType == tr("USB Drive"))
{
#ifndef Q_OS_MAC
- rebootmsgtext->setText(tr("After rebooting, select the USB boot
option in the BIOS boot menu.%1\nReboot now?").arg(postinstmsg));
+ rebootmsgtext->setText(tr("After rebooting, select the USB boot
option in the BIOS boot menu.%1").arg(postinstmsg));
#endif
#ifdef Q_OS_MAC
rebootmsgtext->setText(tr("The created USB device will not boot
off a Mac. Insert it into a PC, and select the USB boot option in the BIOS boot
menu.%1").arg(postinstmsg));
- this->frebootbutton->setEnabled(false);
- this->frebootbutton->hide();
#endif
}
finishLogging();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unetbootin.h new/unetbootin.h
--- old/unetbootin.h 2014-04-20 22:31:45.000000000 +0200
+++ new/unetbootin.h 2016-05-16 10:47:38.000000000 +0200
@@ -287,7 +287,6 @@
QPair<QString, int> weightedFilterNetDir(QString ldfDirStringUrl, int
ldfMinSize, int ldfMaxSize, QList<QRegExp> ldfFileMatchExp);
QString fileFilterNetDir(QStringList ldfDirStringUrlList, int
ldfMinSize, int ldfMaxSize, QList<QRegExp> ldfFileMatchExp);
QPair<QString, int> filterBestMatch(QStringList ufStringList,
QList<QRegExp> filterExpList);
- void sysreboot();
static QString callexternapp(QString xexecFile, QString xexecParm);
static QString callexternappWriteToStdin(QString xexecFile, QString
xexecParm, QString xwriteToStdin);
QString getdevluid(QString voldrive);
@@ -349,7 +348,6 @@
void on_InitrdFileSelector_clicked();
void on_CfgFileSelector_clicked();
void on_cancelbutton_clicked();
- void on_frebootbutton_clicked();
void on_fexitbutton_clicked();
public slots:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unetbootin.ui new/unetbootin.ui
--- old/unetbootin.ui 2014-04-05 08:33:20.000000000 +0200
+++ new/unetbootin.ui 2016-05-16 10:47:38.000000000 +0200
@@ -556,13 +556,6 @@
<number>300</number>
</property>
<item>
- <widget class="QPushButton" name="frebootbutton">
- <property name="text">
- <string>Reboot Now</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QPushButton" name="fexitbutton">
<property name="text">
<string>Exit</string>
@@ -678,7 +671,7 @@
<item>
<widget class="QLabel" name="sdesc4">
<property name="text">
- <string>4. Installation Complete, Reboot</string>
+ <string>4. Installation Complete</string>
</property>
</widget>
</item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unetbootin.xpm new/unetbootin.xpm
--- old/unetbootin.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/unetbootin.xpm 2014-04-05 08:33:20.000000000 +0200
@@ -0,0 +1,221 @@
+/* XPM */
+static char *unetbootin[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 183 2 ",
+" c #020202",
+". c #040404",
+"X c gray2",
+"o c #060606",
+"O c #070707",
+"+ c gray3",
+"@ c #090909",
+"# c gray4",
+"$ c #0C0C0C",
+"% c gray5",
+"& c #0E0E0E",
+"* c #101010",
+"= c #111111",
+"- c gray7",
+"; c #131313",
+": c gray8",
+"> c #151515",
+", c gray9",
+"< c #181818",
+"1 c #191919",
+"2 c gray10",
+"3 c #1B1B1B",
+"4 c gray11",
+"5 c #1D1D1D",
+"6 c #1E1E1E",
+"7 c gray12",
+"8 c gray13",
+"9 c #222222",
+"0 c #232323",
+"q c gray14",
+"w c #252525",
+"e c gray15",
+"r c #272727",
+"t c #282828",
+"y c gray16",
+"u c #2A2A2A",
+"i c gray17",
+"p c #2C2C2C",
+"a c #2D2D2D",
+"s c gray18",
+"d c #323232",
+"f c gray20",
+"g c #343434",
+"h c #353535",
+"j c gray21",
+"k c #373737",
+"l c #3C3C3C",
+"z c #3E3E3E",
+"x c gray25",
+"c c #414141",
+"v c gray26",
+"b c #444444",
+"n c gray27",
+"m c #464646",
+"M c gray28",
+"N c #484848",
+"B c gray29",
+"V c #4C4C4C",
+"C c #4E4E4E",
+"Z c gray31",
+"A c gray32",
+"S c #535353",
+"D c #555555",
+"F c #565656",
+"G c gray34",
+"H c #585858",
+"J c gray35",
+"K c #5A5A5A",
+"L c #5B5B5B",
+"P c gray36",
+"I c gray37",
+"U c #5F5F5F",
+"Y c #606060",
+"T c #626262",
+"R c gray39",
+"E c #646464",
+"W c gray40",
+"Q c #676767",
+"! c DimGray",
+"~ c gray42",
+"^ c #6D6D6D",
+"/ c #6F6F6F",
+"( c gray44",
+") c #717171",
+"_ c #727272",
+"` c #747474",
+"' c gray46",
+"] c #767676",
+"[ c gray47",
+"{ c #797979",
+"} c gray48",
+"| c #7B7B7B",
+" . c #7C7C7C",
+".. c gray49",
+"X. c #7E7E7E",
+"o. c gray50",
+"O. c #808080",
+"+. c #818181",
+"@. c gray51",
+"#. c #838383",
+"$. c #848484",
+"%. c gray52",
+"&. c #868686",
+"*. c #888888",
+"=. c #898989",
+"-. c gray54",
+";. c #8B8B8B",
+":. c gray55",
+">. c #8D8D8D",
+",. c #8E8E8E",
+"<. c gray56",
+"1. c #909090",
+"2. c gray57",
+"3. c #929292",
+"4. c #939393",
+"5. c gray58",
+"6. c #959595",
+"7. c gray59",
+"8. c #979797",
+"9. c #989898",
+"0. c gray60",
+"q. c #9A9A9A",
+"w. c #9B9B9B",
+"e. c gray61",
+"r. c #9D9D9D",
+"t. c gray62",
+"y. c #9F9F9F",
+"u. c #A0A0A0",
+"i. c gray63",
+"p. c #A2A2A2",
+"a. c gray64",
+"s. c #A4A4A4",
+"d. c #A5A5A5",
+"f. c gray65",
+"g. c #A7A7A7",
+"h. c gray66",
+"j. c #A9A9A9",
+"k. c #AAAAAA",
+"l. c gray67",
+"z. c #ACACAC",
+"x. c gray68",
+"c. c #AEAEAE",
+"v. c #AFAFAF",
+"b. c gray69",
+"n. c #B1B1B1",
+"m. c #B2B2B2",
+"M. c gray70",
+"N. c #B4B4B4",
+"B. c gray71",
+"V. c #B6B6B6",
+"C. c #B7B7B7",
+"Z. c gray72",
+"A. c #B9B9B9",
+"S. c gray73",
+"D. c #BBBBBB",
+"F. c #BCBCBC",
+"G. c gray74",
+"H. c gray",
+"J. c gray75",
+"K. c #C0C0C0",
+"L. c #C1C1C1",
+"P. c gray76",
+"I. c gray77",
+"U. c #C5C5C5",
+"Y. c #C6C6C6",
+"T. c gray78",
+"R. c #C8C8C8",
+"E. c gray79",
+"W. c #CACACA",
+"Q. c gray80",
+"!. c #CDCDCD",
+"~. c gray81",
+"^. c #D0D0D0",
+"/. c gray82",
+"(. c #D2D2D2",
+"). c LightGray",
+"_. c gray83",
+"`. c #D5D5D5",
+"'. c #D7D7D7",
+"]. c #D8D8D8",
+"[. c gray85",
+"{. c #DADADA",
+"}. c None",
+/* pixels */
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.r p }.}.}.}.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.& B u 8 }.}.}.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.& U N.s.k 4 }.}.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.- U S.S.l.9.h 4 }.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.& Y H.N.l.i.9.3.h 4 }.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.4 - Q H.N.l.i.t.8.<.-.f 3 }.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.+ - - Q H.b.z.s.i.9.3.<.%.-.r 8 }.",
+"}.}.}.}.}.}.}.}.}.}.}.}.+ O 4 B - Q I.N.l.l.i.9.8.<.%.%.-.p 8 }.",
+"}.}.}.}.}.}.}.}.}.+ O 4 S } ( > ! I.N.b.l.i.t.8.<.-.%.-.k 3 }.}.",
+"}.}.}.}.}.}.O O 4 H %.<.-.] > / I.S.b.z.i.t.8.3.-.%.<.z 3 }.}.}.",
+"}.}.}.O O 4 H <.t.9.3.<.} - / I.H.b.z.s.i.9.3.<.%.<.z 3 }.}.}.}.",
+"}.}. U 9.z.l.i.t.8.3.o.- ( E.H.b.z.l.i.9.8.3.-.<.v 4 }.}.}.}.}.",
+"}.}.+ U b.l.s.i.t.8.o.> ] Q.I.N.b.l.s.t.8.3.-.3.b 4 }.}.}.}.}.}.",
+"}.}.}.+ U l.s.i.9.#.> ] Q.I.S.N.z.s.i.9.8.<.3.b 4 }.}.}.}.}.}.}.",
+"}.}.}.}.O H s.i.%.> ] ^.E.S.b.z.l.i.t.8.3.8.b 4 & }.}.}.}.}.}.}.",
+"}.}.}.}.}.+ G -.- o.^.Q.H.N.b.l.i.i.9.3.8.B 8 & }.}.}.}.}.}.}.}.",
+"}.}.}.}.}.}.> > o._.^.I.S.b.z.s.i.9.8.9.C 8 b + }.}.}.}.}.}.}.}.",
+"}.}.}.}.}.}.- o.^._.I.H.N.z.l.i.9.8.9.C 8 Y p }.}.}.}.}.}.}.}.}.",
+"}.}.}.}.}.> #._._.Q.H.N.b.l.s.t.8.t.C r Q ] O }.}.}.}.}.}.}.}.}.",
+"}.}.}.}.> #.{.{.^.H.S.b.z.s.i.9.i.C r ! o.H + }.}.}.}.}.}.}.}.}.",
+"}.}.}.}.v {._._.I.S.N.z.s.i.9.s.S r ( %.%.p }.}.}.}.}.}.}.}.}.}.",
+"}.}.}.}.& N._.I.H.N.z.l.i.t.s.S r ] -.-.%.O }.}.}.}.}.}.}.}.}.}.",
+"}.}.}.& f 3 N.I.N.b.z.s.t.l.G r } 3.3.<.Y + }.}.}.}.}.}.}.}.}.}.",
+"}.}.& f I.#.> b.S.z.l.i.l.G r o.9.9.8.3.p }.}.}.}.}.}.}.}.}.}.}.",
+"}.& k p 4 I.o.3 b.b.i.z.H r & H t.9.8.<.O }.}.}.}.}.}.}.}.}.}.}.",
+"}.O i.E.<.I.b.] 3 b.H.H u }.}.O H i.9.Q + }.}.}.}.}.}.}.}.}.}.}.",
+"}.}.+ i.E.v > Q > & u r }.}.}.}.+ H t.u }.}.}.}.}.}.}.}.}.}.}.}.",
+"}.}.}.+ 9.b.z O }.}.}.}.}.}.}.}.}.O C }.}.}.}.}.}.}.}.}.}.}.}.",
+"}.}.}.}.+ G + }.}.}.}.}.}.}.}.}.}.}.+ O }.}.}.}.}.}.}.}.}.}.}.}.",
+"}.}.}.}.}.+ }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.",
+"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}."
+};
++++++ unetbootin-suse.patch ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,18 +1,18 @@
-Index: b/distrover.cpp
+Index: distrover.cpp
===================================================================
---- a/distrover.cpp
-+++ b/distrover.cpp
-@@ -176,11 +176,11 @@ unetbootin::tr("<b>Homepage:</b> <a href
+--- distrover.cpp.orig
++++ distrover.cpp
+@@ -175,11 +175,11 @@ unetbootin::tr("<b>Homepage:</b> <a href
"<b>Description:</b> The Offline NT Password and Registry Editor can
reset Windows passwords and edit the registry on Windows 2000-Vista.<br/>"
"<b>Install Notes:</b> NTPasswd is booted and run in live mode; no
installation is required to use it.") <<
"2008.05.26" << "2011.05.11"));
- distroselect->addItem("openSUSE", (QStringList() << "11.1" <<
-+ distroselect->addItem("openSUSE", (QStringList() << "13.2" <<
++ distroselect->addItem("openSUSE", (QStringList() << "Leap_42.1" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://www.opensuse.org/\";>http://www.opensuse.org</a><br/>"
"<b>Description:</b> openSUSE is a user-friendly Novell sponsored
distribution.<br/>"
"<b>Install Notes:</b> The default version allows for both installation
over the internet (FTP), or offline installation using pre-downloaded
installation ISO files.") <<
- "11.1" << "11.1_x64" << "Factory" << "Factory_x64"));
-+ "12.3" << "12.3_x64" << "13.1" << "13.1_x64" << "13.2" << "13.2_x64"
<< "Tumbleweed" << "Tumbleweed_x64" << "Factory" << "Factory_x64"));
++ "13.1" << "13.1_x64" << "13.2" << "13.2_x64" << "Leap_42.1" <<
"Tumbleweed" << "Tumbleweed_x64" << "Factory" << "Factory_x64"));
distroselect->addItem("Ophcrack", (QStringList() << "XP-LiveCD-2.0" <<
unetbootin::tr("<b>Homepage:</b> <a
href=\"http://ophcrack.sourceforge.net/\";>http://ophcrack.sourceforge.net</a><br/>"
"<b>Description:</b> Ophcrack can crack Windows passwords.<br/>"
