Date: Mon, 15 Jan 2018 18:17:14 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459108 - head/sysutils/unetbootin/files Message-ID: <201801151817.w0FIHEqF090064@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jan 15 18:17:14 2018 New Revision: 459108 URL: https://svnweb.freebsd.org/changeset/ports/459108 Log: Unbreak the build against new Clang version 6.0.0. PR: 224989 Modified: head/sysutils/unetbootin/files/patch-unetbootin.cpp Modified: head/sysutils/unetbootin/files/patch-unetbootin.cpp ============================================================================== --- head/sysutils/unetbootin/files/patch-unetbootin.cpp Mon Jan 15 18:14:37 2018 (r459107) +++ head/sysutils/unetbootin/files/patch-unetbootin.cpp Mon Jan 15 18:17:14 2018 (r459108) @@ -161,6 +161,24 @@ rawtargetDev = QString(targetDev).remove(QRegExp("s\\d$")); #endif #endif +@@ -3724,7 +3809,7 @@ void unetbootin::writegrub2cfg() + QString menulstxt = QString( + "%9\n\n" + #ifndef NODEFAULTBOOT +- "\nmenuentry \""UNETBOOTINB"\" {\n" ++ "\nmenuentry \"" UNETBOOTINB "\" {\n" + "\tset root=%8\n" + "\t%1 %2 %3 %4\n" + "\t%5 %6 %7\n" +@@ -3845,7 +3930,7 @@ void unetbootin::runinsthdd() + "timeout 10\n" + #endif + #ifndef NODEFAULTBOOT +- "\ntitle "UNETBOOTINB"\n" ++ "\ntitle " UNETBOOTINB "\n" + #ifdef Q_OS_WIN32 + "find --set-root %3\n" + #endif @@ -4281,21 +4366,47 @@ void unetbootin::runinstusb() instIndvfl("libutil.c32", QString("%1libutil.c32").arg(targetPath)); instIndvfl("libcom32.c32", QString("%1libcom32.c32").arg(targetPath)); @@ -241,3 +259,12 @@ pdesc1->setText(""); progresslayer->setEnabled(false); progresslayer->hide(); +@@ -4343,7 +4468,7 @@ void unetbootin::fininstall() + 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").arg(postinstmsg)); ++ rebootmsgtext->setText(tr("After rebooting, select the " UNETBOOTINB " menu entry to boot.%1").arg(postinstmsg)); + } + if (installType == tr("USB Drive")) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801151817.w0FIHEqF090064>