1 |
commit: 6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 16 14:22:51 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 16 14:23:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad3911d |
7 |
|
8 |
media-plugins/audacious-plugins: Fix build with Qt 5.10 |
9 |
|
10 |
Reported-by: josef.95 <josef.95 <AT> freenet.de> |
11 |
Closes: https://bugs.gentoo.org/643190 |
12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
13 |
|
14 |
.../audacious-plugins-3.9-r1.ebuild | 2 ++ |
15 |
.../files/audacious-plugins-3.9-qt-5.10.patch | 26 ++++++++++++++++++++++ |
16 |
2 files changed, 28 insertions(+) |
17 |
|
18 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild |
19 |
index adef73f950d..21da7bb77a8 100644 |
20 |
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild |
21 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild |
22 |
@@ -111,6 +111,8 @@ DEPEND="${RDEPEND} |
23 |
|
24 |
S="${WORKDIR}/${MY_P}" |
25 |
|
26 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.10.patch" ) |
27 |
+ |
28 |
src_unpack() { |
29 |
if [[ ${PV} == *9999 ]]; then |
30 |
git-r3_src_unpack |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..64122bf9198 |
35 |
--- /dev/null |
36 |
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch |
37 |
@@ -0,0 +1,26 @@ |
38 |
+From 971f7ff7c3d8a0b9b420bf4fd19ab97755607637 Mon Sep 17 00:00:00 2001 |
39 |
+From: ilovezfs <ilovezfs@××××××.com> |
40 |
+Date: Mon, 11 Dec 2017 00:17:26 -0800 |
41 |
+Subject: [PATCH] qtui: fix build with Qt 5.10 |
42 |
+ |
43 |
+Fixes "info_bar.cc:258:21: error: no viable overloaded '='" |
44 |
+--- |
45 |
+ src/qtui/info_bar.cc | 4 ++-- |
46 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
47 |
+ |
48 |
+diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc |
49 |
+index 2789f93c5..eb29ef78e 100644 |
50 |
+--- a/src/qtui/info_bar.cc |
51 |
++++ b/src/qtui/info_bar.cc |
52 |
+@@ -257,8 +257,8 @@ void InfoBar::paintEvent (QPaintEvent *) |
53 |
+ if (d.title.text ().isNull () && ! d.orig_title.isNull ()) |
54 |
+ { |
55 |
+ QFontMetrics metrics = p.fontMetrics (); |
56 |
+- d.title = metrics.elidedText (d.orig_title, Qt::ElideRight, |
57 |
+- width () - ps.VisWidth - ps.Height - ps.Spacing); |
58 |
++ d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight, |
59 |
++ width () - ps.VisWidth - ps.Height - ps.Spacing)); |
60 |
+ } |
61 |
+ |
62 |
+ p.setPen (QColor (255, 255, 255)); |
63 |
+ |