diff options
| -rw-r--r-- | media-sound/cantata/cantata-2.2.0-r3.ebuild (renamed from media-sound/cantata/cantata-2.2.0-r1.ebuild) | 21 | ||||
| -rw-r--r-- | media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 |
2 files changed, 38 insertions, 6 deletions
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r3.ebuild index c19fe4b8..78317c54 100644 --- a/media-sound/cantata/cantata-2.2.0-r1.ebuild +++ b/media-sound/cantata/cantata-2.2.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ REQUIRED_USE=" replaygain? ( taglib ) " -RDEPEND=" +COMMON_DEPEND=" app-misc/media-player-info dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -39,8 +39,8 @@ RDEPEND=" sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) - cdio? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) + cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( @@ -55,7 +55,10 @@ RDEPEND=" udisks? ( sys-fs/udisks:2 ) ) " -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + dev-lang/perl[ithreads] +" +DEPEND="${COMMON_DEPEND} dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 " @@ -63,7 +66,10 @@ DEPEND="${RDEPEND} # cantata has no tests RESTRICT="test" -PATCHES=( "${FILESDIR}/${P}-headers.patch" ) +PATCHES=( + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196 +) src_prepare() { remove_locale() { @@ -83,8 +89,8 @@ src_configure() { local mycmakeargs=( -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" -DENABLE_CDPARANOIA=$(usex cdda) - -DENABLE_CDIOPARANOIA=$(usex cdio) -DENABLE_CDDB=$(usex cddb) + -DENABLE_CDIOPARANOIA=$(usex cdio) -DENABLE_HTTP_SERVER=$(usex http-server) -DENABLE_MTP=$(usex mtp) -DENABLE_MUSICBRAINZ=$(usex musicbrainz) @@ -110,6 +116,9 @@ pkg_preinst() { pkg_postinst() { gnome2_icon_cache_update xdg_pkg_postinst + + has_version media-sound/mpd || \ + elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." } pkg_postrm() { diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch new file mode 100644 index 00000000..16cb6d8c --- /dev/null +++ b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch @@ -0,0 +1,23 @@ +From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001 +From: Craig Drummond <craig.p.drummond@gmail.com> +Date: Tue, 28 Nov 2017 22:37:01 +0000 +Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130 + +--- + db/librarydb.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/db/librarydb.cpp b/db/librarydb.cpp +index 603d8abc1..4f75dc28f 100644 +--- a/db/librarydb.cpp ++++ b/db/librarydb.cpp +@@ -453,7 +453,8 @@ class SqlQuery + if (limit>0) { + sql+=" LIMIT "+QString::number(limit); + } +- query=QSqlQuery(sql, db); ++ query = QSqlQuery(db); ++ query.prepare(sql); + + for (const QVariant &value: boundValues) { + query.addBindValue(value); |