From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 16 Apr 2018 14:22:51 +0000 (+0200)
Subject: media-plugins/audacious-plugins: Fix build with Qt 5.10
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae;p=gentoo.git

media-plugins/audacious-plugins: Fix build with Qt 5.10

Reported-by: josef.95 <josef.95@freenet.de>
Closes: https://bugs.gentoo.org/643190
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
index adef73f950d2..21da7bb77a88 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@@ -111,6 +111,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.10.patch" )
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
new file mode 100644
index 000000000000..64122bf91980
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
@@ -0,0 +1,26 @@
+From 971f7ff7c3d8a0b9b420bf4fd19ab97755607637 Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilovezfs@icloud.com>
+Date: Mon, 11 Dec 2017 00:17:26 -0800
+Subject: [PATCH] qtui: fix build with Qt 5.10
+
+Fixes "info_bar.cc:258:21: error: no viable overloaded '='"
+---
+ src/qtui/info_bar.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc
+index 2789f93c5..eb29ef78e 100644
+--- a/src/qtui/info_bar.cc
++++ b/src/qtui/info_bar.cc
+@@ -257,8 +257,8 @@ void InfoBar::paintEvent (QPaintEvent *)
+         if (d.title.text ().isNull () && ! d.orig_title.isNull ())
+         {
+             QFontMetrics metrics = p.fontMetrics ();
+-            d.title = metrics.elidedText (d.orig_title, Qt::ElideRight,
+-             width () - ps.VisWidth - ps.Height - ps.Spacing);
++            d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight,
++             width () - ps.VisWidth - ps.Height - ps.Spacing));
+         }
+ 
+         p.setPen (QColor (255, 255, 255));
+