| 1 |
commit: 162c9cb5726d5d3a50ee86db61b27c43312f607a |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 19 10:01:15 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 19 10:01:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162c9cb5 |
| 7 |
|
| 8 |
media-sound/karlyriceditor: introduce Qt 5 support |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
.../files/karlyriceditor-2.1-qt55.patch | 12 ++++++++++++ |
| 13 |
.../karlyriceditor/karlyriceditor-2.1.ebuild | 22 +++++++++++++++++----- |
| 14 |
2 files changed, 29 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..7cdc88a |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch |
| 21 |
@@ -0,0 +1,12 @@ |
| 22 |
+Fix build with Qt 5.5 |
| 23 |
+ |
| 24 |
+--- a/src/videoencodingprofiles.h |
| 25 |
++++ b/src/videoencodingprofiles.h |
| 26 |
+@@ -21,6 +21,7 @@ |
| 27 |
+ #define VIDEOENCODINGPROFILES_H |
| 28 |
+ |
| 29 |
+ #include <QMap> |
| 30 |
++#include <QObject> |
| 31 |
+ #include <QString> |
| 32 |
+ #include <QStringList> |
| 33 |
+ |
| 34 |
|
| 35 |
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild |
| 36 |
index 8b13bcb..631f695 100644 |
| 37 |
--- a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild |
| 38 |
+++ b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
-# Copyright 1999-2015 Gentoo Foundation |
| 41 |
+# Copyright 1999-2016 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
# $Id$ |
| 44 |
|
| 45 |
@@ -13,13 +13,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 46 |
LICENSE="GPL-3+" |
| 47 |
SLOT="0" |
| 48 |
KEYWORDS="~amd64 ~x86" |
| 49 |
-IUSE="libav" |
| 50 |
+IUSE="libav qt5" |
| 51 |
|
| 52 |
RDEPEND=" |
| 53 |
dev-libs/openssl:0 |
| 54 |
- dev-qt/qtcore:4 |
| 55 |
- dev-qt/qtgui:4 |
| 56 |
media-libs/libsdl[sound] |
| 57 |
+ qt5? ( |
| 58 |
+ dev-qt/qtcore:5 |
| 59 |
+ dev-qt/qtgui:5 |
| 60 |
+ dev-qt/qtwidgets:5 |
| 61 |
+ ) |
| 62 |
+ !qt5? ( |
| 63 |
+ dev-qt/qtcore:4 |
| 64 |
+ dev-qt/qtgui:4 |
| 65 |
+ ) |
| 66 |
libav? ( media-video/libav:= ) |
| 67 |
!libav? ( media-video/ffmpeg:= ) |
| 68 |
" |
| 69 |
@@ -30,10 +37,15 @@ DEPEND="${RDEPEND} |
| 70 |
PATCHES=( |
| 71 |
"${FILESDIR}/${PN}-1.11-libav.patch" |
| 72 |
"${FILESDIR}/${PN}-2.1-ffmpeg3.patch" |
| 73 |
+ "${FILESDIR}/${PN}-2.1-qt55.patch" |
| 74 |
) |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
- eqmake4 "${PN}.pro" |
| 78 |
+ if use qt5; then |
| 79 |
+ eqmake5 "${PN}.pro" |
| 80 |
+ else |
| 81 |
+ eqmake4 "${PN}.pro" |
| 82 |
+ fi |
| 83 |
} |
| 84 |
|
| 85 |
src_install() { |
Archives