From 5cefc104e69f89170a1853c7c0bc8ae5747f20c2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:30:21 +0100 Subject: media-sound/cantata : revision bump --- media-sound/cantata/cantata-2.2.0-r1.ebuild | 118 ------------------- media-sound/cantata/cantata-2.2.0-r3.ebuild | 127 +++++++++++++++++++++ .../cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 ++++ 3 files changed, 150 insertions(+), 118 deletions(-) delete mode 100644 media-sound/cantata/cantata-2.2.0-r1.ebuild create mode 100644 media-sound/cantata/cantata-2.2.0-r3.ebuild create mode 100644 media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch (limited to 'media-sound') diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r1.ebuild deleted file mode 100644 index c19fe4b8..00000000 --- a/media-sound/cantata/cantata-2.2.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN" -inherit cmake-utils gnome2-utils l10n qmake-utils xdg - -DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" -HOMEPAGE="https://github.com/CDrummond/cantata" -SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks" -REQUIRED_USE=" - ?? ( cdda cdio ) - cdda? ( udisks || ( cddb musicbrainz ) ) - cddb? ( || ( cdio cdda ) taglib ) - cdio? ( udisks || ( cddb musicbrainz ) ) - mtp? ( taglib udisks ) - musicbrainz? ( || ( cdio cdda ) taglib ) - replaygain? ( taglib ) -" - -RDEPEND=" - app-misc/media-player-info - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-sound/mpd - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) - sys-libs/zlib - virtual/libudev:= - cdda? ( media-sound/cdparanoia ) - cdio? ( dev-libs/libcdio-paranoia ) - cddb? ( media-libs/libcddb ) - mtp? ( media-libs/libmtp ) - musicbrainz? ( media-libs/musicbrainz:5= ) - replaygain? ( - media-libs/libebur128 - media-sound/mpg123 - virtual/ffmpeg - ) - streaming? ( media-video/vlc:0= ) - taglib? ( - media-libs/taglib[asf(+),mp4(+)] - media-libs/taglib-extras - udisks? ( sys-fs/udisks:2 ) - ) -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - dev-qt/linguist-tools:5 -" - -# cantata has no tests -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${P}-headers.patch" ) - -src_prepare() { - remove_locale() { - rm "translations/${PN}_${1}".ts || die - } - - cmake-utils_src_prepare - - # Unbundle 3rd party libs - rm -r 3rdparty/{ebur128,qtsingleapplication} || die - - l10n_find_plocales_changes "translations" "${PN}_" ".ts" - l10n_for_each_disabled_locale_do remove_locale -} - -src_configure() { - local mycmakeargs=( - -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" - -DENABLE_CDPARANOIA=$(usex cdda) - -DENABLE_CDIOPARANOIA=$(usex cdio) - -DENABLE_CDDB=$(usex cddb) - -DENABLE_HTTP_SERVER=$(usex http-server) - -DENABLE_MTP=$(usex mtp) - -DENABLE_MUSICBRAINZ=$(usex musicbrainz) - -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" - -DENABLE_FFMPEG=$(usex replaygain) - -DENABLE_MPG123=$(usex replaygain) - -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) - -DENABLE_TAGLIB=$(usex taglib) - -DENABLE_TAGLIB_EXTRAS=$(usex taglib) - -DENABLE_DEVICES_SUPPORT=$(usex udisks) - -DENABLE_REMOTE_DEVICES=OFF - -DENABLE_UDISKS2=ON - ) - - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist - xdg_pkg_preinst -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_pkg_postrm -} diff --git a/media-sound/cantata/cantata-2.2.0-r3.ebuild b/media-sound/cantata/cantata-2.2.0-r3.ebuild new file mode 100644 index 00000000..78317c54 --- /dev/null +++ b/media-sound/cantata/cantata-2.2.0-r3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN" +inherit cmake-utils gnome2-utils l10n qmake-utils xdg + +DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" +HOMEPAGE="https://github.com/CDrummond/cantata" +SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks" +REQUIRED_USE=" + ?? ( cdda cdio ) + cdda? ( udisks || ( cddb musicbrainz ) ) + cddb? ( || ( cdio cdda ) taglib ) + cdio? ( udisks || ( cddb musicbrainz ) ) + mtp? ( taglib udisks ) + musicbrainz? ( || ( cdio cdda ) taglib ) + replaygain? ( taglib ) +" + +COMMON_DEPEND=" + app-misc/media-player-info + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-sound/mpd + || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) + sys-libs/zlib + virtual/libudev:= + cdda? ( media-sound/cdparanoia ) + cddb? ( media-libs/libcddb ) + cdio? ( dev-libs/libcdio-paranoia ) + mtp? ( media-libs/libmtp ) + musicbrainz? ( media-libs/musicbrainz:5= ) + replaygain? ( + media-libs/libebur128 + media-sound/mpg123 + virtual/ffmpeg + ) + streaming? ( media-video/vlc:0= ) + taglib? ( + media-libs/taglib[asf(+),mp4(+)] + media-libs/taglib-extras + udisks? ( sys-fs/udisks:2 ) + ) +" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl[ithreads] +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtconcurrent:5 + dev-qt/linguist-tools:5 +" + +# cantata has no tests +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196 +) + +src_prepare() { + remove_locale() { + rm "translations/${PN}_${1}".ts || die + } + + cmake-utils_src_prepare + + # Unbundle 3rd party libs + rm -r 3rdparty/{ebur128,qtsingleapplication} || die + + l10n_find_plocales_changes "translations" "${PN}_" ".ts" + l10n_for_each_disabled_locale_do remove_locale +} + +src_configure() { + local mycmakeargs=( + -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" + -DENABLE_CDPARANOIA=$(usex cdda) + -DENABLE_CDDB=$(usex cddb) + -DENABLE_CDIOPARANOIA=$(usex cdio) + -DENABLE_HTTP_SERVER=$(usex http-server) + -DENABLE_MTP=$(usex mtp) + -DENABLE_MUSICBRAINZ=$(usex musicbrainz) + -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" + -DENABLE_FFMPEG=$(usex replaygain) + -DENABLE_MPG123=$(usex replaygain) + -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) + -DENABLE_TAGLIB=$(usex taglib) + -DENABLE_TAGLIB_EXTRAS=$(usex taglib) + -DENABLE_DEVICES_SUPPORT=$(usex udisks) + -DENABLE_REMOTE_DEVICES=OFF + -DENABLE_UDISKS2=ON + ) + + cmake-utils_src_configure +} + +pkg_preinst() { + gnome2_icon_savelist + xdg_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() { + gnome2_icon_cache_update + xdg_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 +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); -- cgit v1.2.3