From owner-svn-ports-head@freebsd.org  Mon Jan 15 18:17:15 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D4E1E653F5;
 Mon, 15 Jan 2018 18:17:15 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 75BB537B4;
 Mon, 15 Jan 2018 18:17:15 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C560E14BD4;
 Mon, 15 Jan 2018 18:17:14 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FIHEtu090065;
 Mon, 15 Jan 2018 18:17:14 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FIHEqF090064;
 Mon, 15 Jan 2018 18:17:14 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201801151817.w0FIHEqF090064@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 15 Jan 2018 18:17:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r459108 - head/sysutils/unetbootin/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/sysutils/unetbootin/files
X-SVN-Commit-Revision: 459108
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jan 2018 18:17:15 -0000

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"))
+ 	{