From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058365-garchives=archives.gentoo.org@lists.gentoo.org>
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 58CCD138334
for <garchives@archives.gentoo.org>; Thu, 22 Nov 2018 21:48:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7B7CBE097D;
Thu, 22 Nov 2018 21:48:55 +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 4D362E097B
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2018 21:48:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 E7646335CDD
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2018 21:48:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4439D46E
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2018 21:48:51 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1542923316.7222b3663c3654fb3159fefff328cbc003733e5d.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch media-sound/lmms/lmms-1.2.0_rc4.ebuild
X-VCS-Directories: media-sound/lmms/files/ media-sound/lmms/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 7222b3663c3654fb3159fefff328cbc003733e5d
X-VCS-Branch: master
Date: Thu, 22 Nov 2018 21:48:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 86381637-93ef-4ba2-bace-5d94491c0bfb
X-Archives-Hash: e3bc272562c41d25853e1b8e0c63a939
commit: 7222b3663c3654fb3159fefff328cbc003733e5d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 21:47:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 21:48:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7222b366
media-sound/lmms: Fix build with Qt 5.11.0
Using upstream patch from git master (>1.2.0_rc7).
Closes: https://bugs.gentoo.org/670250
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../lmms/files/lmms-1.2.0_rc4-qt-5.11.patch | 22 ++++++++++++++++++++++
media-sound/lmms/lmms-1.2.0_rc4.ebuild | 4 +++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
new file mode 100644
index 00000000000..ee1328e8c96
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
@@ -0,0 +1,22 @@
+From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001
+From: Hyunjin Song <tteu.ingog@gmail.com>
+Date: Wed, 23 May 2018 14:59:45 +0900
+Subject: [PATCH] Fix compilation with Qt 5.11 (#4374)
+
+Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
+---
+ src/gui/Forms/EffectSelectDialog.ui | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui
+index a9c6de0191..f8e7734862 100644
+--- a/src/gui/Forms/EffectSelectDialog.ui
++++ b/src/gui/Forms/EffectSelectDialog.ui
+@@ -102,6 +102,7 @@
+ <customwidgets>
+ <customwidget>
+ <class>RowTableView</class>
++ <extends>QTableView</extends>
+ <header>RowTableView.h</header>
+ </customwidget>
+ </customwidgets>
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
index 354ba7ece7b..a85c255a0f3 100644
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -61,6 +61,8 @@ RDEPEND="${COMMON_DEPEND}
DOCS=( README.md doc/AUTHORS )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs+=(
-DUSE_WERROR=FALSE