summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-02-19 21:01:15 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-02-19 21:01:45 +1100
commit162c9cb5726d5d3a50ee86db61b27c43312f607a (patch)
tree1efc06c701a3d5fb9b7b4e3cfee985c20a113b2d /media-sound/karlyriceditor
parentMerge remote-tracking branch 'github/pr/872'. (diff)
downloadgentoo-162c9cb5726d5d3a50ee86db61b27c43312f607a.tar.gz
gentoo-162c9cb5726d5d3a50ee86db61b27c43312f607a.tar.bz2
gentoo-162c9cb5726d5d3a50ee86db61b27c43312f607a.zip
media-sound/karlyriceditor: introduce Qt 5 support
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-sound/karlyriceditor')
-rw-r--r--media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch12
-rw-r--r--media-sound/karlyriceditor/karlyriceditor-2.1.ebuild22
2 files changed, 29 insertions, 5 deletions
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
new file mode 100644
index 000000000000..7cdc88ae2aa1
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
@@ -0,0 +1,12 @@
+Fix build with Qt 5.5
+
+--- a/src/videoencodingprofiles.h
++++ b/src/videoencodingprofiles.h
+@@ -21,6 +21,7 @@
+ #define VIDEOENCODINGPROFILES_H
+
+ #include <QMap>
++#include <QObject>
+ #include <QString>
+ #include <QStringList>
+
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
index 8b13bcbb75e4..631f6958c41a 100644
--- a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
+++ b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,13 +13,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libav"
+IUSE="libav qt5"
RDEPEND="
dev-libs/openssl:0
- dev-qt/qtcore:4
- dev-qt/qtgui:4
media-libs/libsdl[sound]
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ !qt5? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
"
@@ -30,10 +37,15 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.11-libav.patch"
"${FILESDIR}/${PN}-2.1-ffmpeg3.patch"
+ "${FILESDIR}/${PN}-2.1-qt55.patch"
)
src_configure() {
- eqmake4 "${PN}.pro"
+ if use qt5; then
+ eqmake5 "${PN}.pro"
+ else
+ eqmake4 "${PN}.pro"
+ fi
}
src_install() {