From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FA5E1382C5 for ; Mon, 16 Apr 2018 14:23:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60B86E086C; Mon, 16 Apr 2018 14:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BA81E086C for ; Mon, 16 Apr 2018 14:23:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91B9C335C88 for ; Mon, 16 Apr 2018 14:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82CDA260 for ; Mon, 16 Apr 2018 14:23:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1523888596.6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch X-VCS-Directories: media-plugins/audacious-plugins/files/ media-plugins/audacious-plugins/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae X-VCS-Branch: master Date: Mon, 16 Apr 2018 14:23:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3f3dbcc-d999-4a9e-b187-7bf92e31ba23 X-Archives-Hash: c9da831bb39e643c20fc23d081625c71 commit: 6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 16 14:22:51 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 16 14:23:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad3911d media-plugins/audacious-plugins: Fix build with Qt 5.10 Reported-by: josef.95 freenet.de> Closes: https://bugs.gentoo.org/643190 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../audacious-plugins-3.9-r1.ebuild | 2 ++ .../files/audacious-plugins-3.9-qt-5.10.patch | 26 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) 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 adef73f950d..21da7bb77a8 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 00000000000..64122bf9198 --- /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 +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)); +