Date: Tue, 15 May 2018 15:13:11 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470024 - head/emulators/mgba/files Message-ID: <201805151513.w4FFDB8f016754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue May 15 15:13:11 2018 New Revision: 470024 URL: https://svnweb.freebsd.org/changeset/ports/470024 Log: Add upstream patch to fix the build with Qt 5.10. /wrkdirs/usr/ports/emulators/mgba/work/mgba-0.6.1/src/platform/qt/MemoryModel.cpp:102:15: error: no viable overloaded '=' m_regionName = name; ~~~~~~~~~~~~ ^ ~~~~ PR: 228213 Added: head/emulators/mgba/files/ head/emulators/mgba/files/patch-git_e3137356 (contents, props changed) Added: head/emulators/mgba/files/patch-git_e3137356 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/mgba/files/patch-git_e3137356 Tue May 15 15:13:11 2018 (r470024) @@ -0,0 +1,21 @@ +From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001 +From: ilovezfs <ilovezfs@icloud.com> +Date: Mon, 11 Dec 2017 00:39:32 -0800 +Subject: [PATCH] Qt: Fix build with Qt 5.10 + +Fixes "MemoryModel.cpp:102:15: error: no viable overloaded '='" +--- + src/platform/qt/MemoryModel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- src/platform/qt/MemoryModel.cpp ++++ src/platform/qt/MemoryModel.cpp +@@ -99,7 +99,7 @@ void MemoryModel::setRegion(uint32_t base, uint32_t size, const QString& name, i + m_top = 0; + m_base = base; + m_size = size; +- m_regionName = name; ++ m_regionName = QStaticText(name); + m_regionName.prepare(QTransform(), m_font); + m_currentBank = segment; + verticalScrollBar()->setRange(0, (size >> 4) + 1 - viewport()->size().height() / m_cellHeight);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805151513.w4FFDB8f016754>