| 1 |
commit: 7222b3663c3654fb3159fefff328cbc003733e5d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 22 21:47:47 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 22 21:48:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7222b366 |
| 7 |
|
| 8 |
media-sound/lmms: Fix build with Qt 5.11.0 |
| 9 |
|
| 10 |
Using upstream patch from git master (>1.2.0_rc7). |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/670250 |
| 13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../lmms/files/lmms-1.2.0_rc4-qt-5.11.patch | 22 ++++++++++++++++++++++ |
| 17 |
media-sound/lmms/lmms-1.2.0_rc4.ebuild | 4 +++- |
| 18 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..ee1328e8c96 |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Hyunjin Song <tteu.ingog@×××××.com> |
| 28 |
+Date: Wed, 23 May 2018 14:59:45 +0900 |
| 29 |
+Subject: [PATCH] Fix compilation with Qt 5.11 (#4374) |
| 30 |
+ |
| 31 |
+Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f |
| 32 |
+--- |
| 33 |
+ src/gui/Forms/EffectSelectDialog.ui | 1 + |
| 34 |
+ 1 file changed, 1 insertion(+) |
| 35 |
+ |
| 36 |
+diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui |
| 37 |
+index a9c6de0191..f8e7734862 100644 |
| 38 |
+--- a/src/gui/Forms/EffectSelectDialog.ui |
| 39 |
++++ b/src/gui/Forms/EffectSelectDialog.ui |
| 40 |
+@@ -102,6 +102,7 @@ |
| 41 |
+ <customwidgets> |
| 42 |
+ <customwidget> |
| 43 |
+ <class>RowTableView</class> |
| 44 |
++ <extends>QTableView</extends> |
| 45 |
+ <header>RowTableView.h</header> |
| 46 |
+ </customwidget> |
| 47 |
+ </customwidgets> |
| 48 |
|
| 49 |
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild |
| 50 |
index 354ba7ece7b..a85c255a0f3 100644 |
| 51 |
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild |
| 52 |
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2018 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -61,6 +61,8 @@ RDEPEND="${COMMON_DEPEND} |
| 60 |
|
| 61 |
DOCS=( README.md doc/AUTHORS ) |
| 62 |
|
| 63 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
local mycmakeargs+=( |
| 67 |
-DUSE_WERROR=FALSE |
Archives