From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Mar 2018 04:54:42 +0000 Subject: gentoo resync : 18.03.2018 --- media-sound/cantata/Manifest | 2 + media-sound/cantata/cantata-2.2.0-r1.ebuild | 122 +++++++++++++++++++++ .../cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 ++++ 3 files changed, 147 insertions(+) create mode 100644 media-sound/cantata/cantata-2.2.0-r1.ebuild create mode 100644 media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch (limited to 'media-sound/cantata') diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 91465536253f..13c8b330cdfa 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1,4 +1,6 @@ AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df +AUX cantata-2.2.0-qtsql-5.10.patch 745 BLAKE2B d0c5e3586bb3303983f6d57bacba275e7b0895c56b43ebde69d7664f4bd57f8e1726982389b3da81487918d41085459f6bb2d9bbf2168f5737d7860d6ee68402 SHA512 1622fe94c814544192453d6ee2fa3158cc19d414e37dd76e88724c5056ff290d0070bb251c2f46a83dace906490625b43bcd51ffafa51c65e2dd500c971ea570 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd +EBUILD cantata-2.2.0-r1.ebuild 2959 BLAKE2B 995c1d9bd6d66f62bef6838b8f82377e3c869b73bcbb2c499208ced2e5efac5ced285a9a73a064d19f8af354a04d39ea49b7d5f34cff29d7babe4ace52a02bec SHA512 07cacd181b9296cd1cae56e3ee45ff7e5983b463f9c8cd3dfd58854a74f5ce55f83844ba726de07b80ba2dbbd478edbe000871a4b58f6a4f703b5fb1e31b7241 EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97 diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r1.ebuild new file mode 100644 index 000000000000..9b255bbabbb8 --- /dev/null +++ b/media-sound/cantata/cantata-2.2.0-r1.ebuild @@ -0,0 +1,122 @@ +# 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 ) +" + +RDEPEND=" + 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 + || ( 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 ) + ) +" +DEPEND="${RDEPEND} + 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 000000000000..16cb6d8c2d1f --- /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