Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
Date: Wed, 02 Aug 2017 21:37:08
Message-Id: 1501709672.8606353ff85e982c42f8d10e519af8cf15d47b48.asturm@gentoo
1 commit: 8606353ff85e982c42f8d10e519af8cf15d47b48
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 2 21:33:55 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 2 21:34:32 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8606353f
7
8 media-sound/cantata: Drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 media-sound/cantata/Manifest | 1 -
13 media-sound/cantata/cantata-2.0.1-r1.ebuild | 120 ---------------------
14 .../files/cantata-2.0.1-mpris-plasma57.patch | 46 --------
15 .../cantata/files/cantata-2.0.1-mpris-true.patch | 100 -----------------
16 .../cantata/files/cantata-2.0.1-qt5-no-X11.patch | 14 ---
17 5 files changed, 281 deletions(-)
18
19 diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
20 index 6b8b4883803..220f9d133c3 100644
21 --- a/media-sound/cantata/Manifest
22 +++ b/media-sound/cantata/Manifest
23 @@ -1,2 +1 @@
24 -DIST cantata-2.0.1.tar.bz2 2151126 SHA256 122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02 WHIRLPOOL 138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
25 DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
26
27 diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild b/media-sound/cantata/cantata-2.0.1-r1.ebuild
28 deleted file mode 100644
29 index 5b524f4a4fb..00000000000
30 --- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
31 +++ /dev/null
32 @@ -1,120 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PLOCALES="cs de en_GB es fr hu ko pl ru zh_CN"
39 -inherit cmake-utils gnome2-utils l10n qmake-utils xdg
40 -
41 -DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
42 -HOMEPAGE="https://github.com/CDrummond/cantata"
43 -SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="cdda cddb http-server mtp musicbrainz replaygain taglib udisks"
49 -REQUIRED_USE="
50 - cdda? ( udisks || ( cddb musicbrainz ) )
51 - cddb? ( cdda taglib )
52 - mtp? ( taglib udisks )
53 - musicbrainz? ( cdda taglib )
54 - replaygain? ( taglib )
55 -"
56 -
57 -RDEPEND="
58 - dev-db/sqlite:3
59 - dev-qt/qtconcurrent:5
60 - dev-qt/qtcore:5
61 - dev-qt/qtdbus:5
62 - dev-qt/qtgui:5
63 - dev-qt/qtnetwork:5
64 - dev-qt/qtsql:5
65 - dev-qt/qtsvg:5
66 - dev-qt/qtwidgets:5
67 - dev-qt/qtxml:5
68 - sys-libs/zlib
69 - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
70 - cdda? ( media-sound/cdparanoia )
71 - cddb? ( media-libs/libcddb )
72 - mtp? ( media-libs/libmtp )
73 - musicbrainz? ( media-libs/musicbrainz:5= )
74 - replaygain? (
75 - media-libs/libebur128
76 - media-sound/mpg123
77 - virtual/ffmpeg
78 - )
79 - taglib? (
80 - media-libs/taglib[asf(+),mp4(+)]
81 - media-libs/taglib-extras
82 - udisks? ( sys-fs/udisks:2 )
83 - )
84 -"
85 -DEPEND="${RDEPEND}
86 - dev-qt/linguist-tools:5
87 -"
88 -
89 -# cantata has no tests
90 -RESTRICT="test"
91 -
92 -PATCHES=(
93 - "${FILESDIR}/${P}-mpris-true.patch"
94 - "${FILESDIR}/${P}-mpris-plasma57.patch"
95 - "${FILESDIR}/${P}-qt5-no-X11.patch"
96 -)
97 -
98 -src_prepare() {
99 - cmake-utils_src_prepare
100 -
101 - # Unbundle 3rd party libs
102 - rm -rf 3rdparty/qtsingleapplication/ || die
103 - rm -rf 3rdparty/libebur128/ || die
104 - # qjson ebuild does not support Qt5 yet
105 - rm -rf 3rdparty/qjson/ || die
106 -
107 - l10n_find_plocales_changes 'po' '' '.po'
108 -}
109 -
110 -src_configure() {
111 - local langs="$(l10n_get_locales)"
112 -
113 - local mycmakeargs=(
114 - -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
115 - -DCANTATA_TRANSLATIONS="${langs// /;}"
116 - -DENABLE_CDPARANOIA=$(usex cdda)
117 - -DENABLE_CDDB=$(usex cddb)
118 - -DENABLE_HTTP_SERVER=$(usex http-server)
119 - -DENABLE_MTP=$(usex mtp)
120 - -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
121 - -DENABLE_QT5=ON
122 - -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
123 - -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
124 - -DENABLE_FFMPEG=$(usex replaygain)
125 - -DENABLE_MPG123=$(usex replaygain)
126 - -DENABLE_TAGLIB=$(usex taglib)
127 - -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
128 - -DENABLE_DEVICES_SUPPORT=$(usex udisks)
129 - -DENABLE_HTTP_STREAM_PLAYBACK=OFF
130 - -DENABLE_REMOTE_DEVICES=OFF
131 - -DENABLE_UDISKS2=ON
132 - -DUSE_SYSTEM_MENU_ICON=OFF
133 - )
134 -# -DENABLE_KDE=$(usex kde) # not yet ported to KF5
135 -
136 - cmake-utils_src_configure
137 -}
138 -
139 -pkg_preinst() {
140 - gnome2_icon_savelist
141 - xdg_pkg_preinst
142 -}
143 -
144 -pkg_postinst() {
145 - gnome2_icon_cache_update
146 - xdg_pkg_postinst
147 -}
148 -
149 -pkg_postrm() {
150 - gnome2_icon_cache_update
151 - xdg_pkg_postrm
152 -}
153
154 diff --git a/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
155 deleted file mode 100644
156 index 3965b425a93..00000000000
157 --- a/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
158 +++ /dev/null
159 @@ -1,46 +0,0 @@
160 -Work-around KDE 5.7 MPRIS issues.
161 -
162 -diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
163 -index cc2b532..37eec9e 100644
164 ---- a/gui/mainwindow.cpp
165 -+++ b/gui/mainwindow.cpp
166 -@@ -1410,8 +1410,8 @@ void MainWindow::setRating()
167 - }
168 - }
169 -
170 --void MainWindow::readSettings()
171 --{
172 -+void MainWindow::initMpris()
173 -+{
174 - #ifdef QT_QTDBUS_FOUND
175 - if (Settings::self()->mpris()) {
176 - if (!mpris) {
177 -@@ -1424,6 +1424,16 @@ void MainWindow::readSettings()
178 - mpris=0;
179 - }
180 - CurrentCover::self()->setEnabled(mpris || Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
181 -+ #endif
182 -+}
183 -+
184 -+void MainWindow::readSettings()
185 -+{
186 -+ #ifdef QT_QTDBUS_FOUND
187 -+ // It appears as if the KDE MPRIS code does not like the MPRIS interface to be setup before the window is visible.
188 -+ // to work-around this, initMpris in the next event loop iteration.
189 -+ // See #863
190 -+ QTimer::singleShot(0, this, SLOT(initMpris()));
191 - #else
192 - CurrentCover::self()->setEnabled(Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
193 - #endif
194 -diff --git a/gui/mainwindow.h b/gui/mainwindow.h
195 -index 6d6e960..aa3a80a 100644
196 ---- a/gui/mainwindow.h
197 -+++ b/gui/mainwindow.h
198 -@@ -268,6 +268,7 @@ public Q_SLOTS:
199 - private Q_SLOTS:
200 - void toggleContext();
201 - void toggleMenubar();
202 -+ void initMpris();
203 -
204 - private:
205 - int prevPage;
206
207 diff --git a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
208 deleted file mode 100644
209 index c32f745b82f..00000000000
210 --- a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
211 +++ /dev/null
212 @@ -1,100 +0,0 @@
213 -Always return true for MPRIS CanPlay, CanPause, etc.
214 -
215 -diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
216 -index 4736d19..45a539a 100644
217 ---- a/dbus/mpris.cpp
218 -+++ b/dbus/mpris.cpp
219 -@@ -65,6 +65,31 @@ Mpris::~Mpris()
220 - QDBusConnection::sessionBus().unregisterService("org.mpris.MediaPlayer2.cantata");
221 - }
222 -
223 -+void Mpris::Pause()
224 -+{
225 -+ if (MPDState_Playing==MPDStatus::self()->state()) {
226 -+ StdActions::self()->playPauseTrackAction->trigger();
227 -+ }
228 -+}
229 -+
230 -+void Mpris::Play()
231 -+{
232 -+ MPDStatus * const status = MPDStatus::self();
233 -+ if (status->playlistLength() && MPDState_Playing!=status->state()) {
234 -+ StdActions::self()->playPauseTrackAction->trigger();
235 -+ }
236 -+}
237 -+
238 -+QString Mpris::PlaybackStatus() const
239 -+{
240 -+ switch(MPDStatus::self()->state()) {
241 -+ case MPDState_Playing: return QLatin1String("Playing");
242 -+ case MPDState_Paused: return QLatin1String("Paused");
243 -+ default:
244 -+ case MPDState_Stopped: return QLatin1String("Stopped");
245 -+ }
246 -+}
247 -+
248 - qlonglong Mpris::Position() const
249 - {
250 - // Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
251 -diff --git a/dbus/mpris.h b/dbus/mpris.h
252 -index 64a4fbe..a1578b9 100644
253 ---- a/dbus/mpris.h
254 -+++ b/dbus/mpris.h
255 -@@ -71,37 +71,15 @@ class Mpris : public QObject
256 - // org.mpris.MediaPlayer2.Player
257 - void Next() { StdActions::self()->nextTrackAction->trigger(); }
258 - void Previous() { StdActions::self()->prevTrackAction->trigger(); }
259 -- void Pause() {
260 -- if (MPDState_Playing==MPDStatus::self()->state()) {
261 -- StdActions::self()->playPauseTrackAction->trigger();
262 -- }
263 -- }
264 --
265 -+ void Pause();
266 - void PlayPause() { StdActions::self()->playPauseTrackAction->trigger(); }
267 - void Stop() { StdActions::self()->stopPlaybackAction->trigger(); }
268 - void StopAfterCurrent() { StdActions::self()->stopAfterCurrentTrackAction->trigger(); }
269 --
270 -- void Play() {
271 -- MPDStatus * const status = MPDStatus::self();
272 --
273 -- if (status->playlistLength() && MPDState_Playing!=status->state()) {
274 -- StdActions::self()->playPauseTrackAction->trigger();
275 -- }
276 -- }
277 --
278 -+ void Play();
279 - void Seek(qlonglong pos) { emit setSeekId(-1, pos/1000000); }
280 - void SetPosition(const QDBusObjectPath &, qlonglong pos) {emit setSeekId(-1, pos/1000000); }
281 - void OpenUri(const QString &) { }
282 --
283 -- QString PlaybackStatus() {
284 -- switch(MPDStatus::self()->state()) {
285 -- case MPDState_Playing: return QLatin1String("Playing");
286 -- case MPDState_Paused: return QLatin1String("Paused");
287 -- default:
288 -- case MPDState_Stopped: return QLatin1String("Stopped");
289 -- }
290 -- }
291 --
292 -+ QString PlaybackStatus() const;
293 - QString LoopStatus() { return MPDStatus::self()->repeat() ? QLatin1String("Playlist") : QLatin1String("None"); }
294 - void SetLoopStatus(const QString &s) { emit setRepeat(QLatin1String("None")!=s); }
295 - QVariantMap Metadata() const;
296 -@@ -115,11 +93,11 @@ class Mpris : public QObject
297 - double MinimumRate() const { return 1.0; }
298 - double MaximumRate() const { return 1.0; }
299 - bool CanControl() const { return true; }
300 -- bool CanPlay() const { return MPDState_Playing!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>0; }
301 -- bool CanPause() const { return MPDState_Playing==MPDStatus::self()->state(); }
302 -- bool CanSeek() const { return -1!=MPDStatus::self()->songId(); }
303 -- bool CanGoNext() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
304 -- bool CanGoPrevious() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
305 -+ bool CanPlay() const { return true; }
306 -+ bool CanPause() const { return true; }
307 -+ bool CanSeek() const { return true; }
308 -+ bool CanGoNext() const { return true; }
309 -+ bool CanGoPrevious() const { return true; }
310 -
311 - // org.mpris.MediaPlayer2
312 - bool CanQuit() const { return true; }
313
314 diff --git a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch b/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
315 deleted file mode 100644
316 index de90cd68450..00000000000
317 --- a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
318 +++ /dev/null
319 @@ -1,14 +0,0 @@
320 -diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
321 -index fcdaf5c..f6160f0 100644
322 ---- a/support/CMakeLists.txt
323 -+++ b/support/CMakeLists.txt
324 -@@ -89,7 +89,7 @@ if (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
325 -
326 - add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS})
327 -
328 -- if (X11_FOUND)
329 -+ if (NOT ENABLE_QT5 AND X11_FOUND)
330 - target_link_libraries(support ${X11_LIBRARIES})
331 -- endif (X11_FOUND)
332 -+ endif (NOT ENABLE_QT5 AND X11_FOUND)
333 - endif (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)