media-sound/cantata: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

3 files changed, 0 insertions, 160 deletions

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
deleted file mode 100644
index 3965b425a938..000000000000
--- a/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Work-around KDE 5.7 MPRIS issues. 
-
-diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
-index cc2b532..37eec9e 100644
---- a/gui/mainwindow.cpp
-+++ b/gui/mainwindow.cpp
-@@ -1410,8 +1410,8 @@ void MainWindow::setRating()
-     }
- }
- 
--void MainWindow::readSettings()
--{    
-+void MainWindow::initMpris()
-+{
-     #ifdef QT_QTDBUS_FOUND
-     if (Settings::self()->mpris()) {
-         if (!mpris) {
-@@ -1424,6 +1424,16 @@ void MainWindow::readSettings()
-         mpris=0;
-     }
-     CurrentCover::self()->setEnabled(mpris || Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
-+    #endif
-+}
-+
-+void MainWindow::readSettings()
-+{    
-+    #ifdef QT_QTDBUS_FOUND
-+    // It appears as if the KDE MPRIS code does not like the MPRIS interface to be setup before the window is visible.
-+    // to work-around this, initMpris in the next event loop iteration.
-+    // See #863
-+    QTimer::singleShot(0, this, SLOT(initMpris()));
-     #else
-     CurrentCover::self()->setEnabled(Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
-     #endif
-diff --git a/gui/mainwindow.h b/gui/mainwindow.h
-index 6d6e960..aa3a80a 100644
---- a/gui/mainwindow.h
-+++ b/gui/mainwindow.h
-@@ -268,6 +268,7 @@ public Q_SLOTS:
- private Q_SLOTS:
-     void toggleContext();
-     void toggleMenubar();
-+    void initMpris();
- 
- private:
-     int prevPage;
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
deleted file mode 100644
index c32f745b82f7..000000000000
--- a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Always return true for MPRIS CanPlay, CanPause, etc.
-
-diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
-index 4736d19..45a539a 100644
---- a/dbus/mpris.cpp
-+++ b/dbus/mpris.cpp
-@@ -65,6 +65,31 @@ Mpris::~Mpris()
-     QDBusConnection::sessionBus().unregisterService("org.mpris.MediaPlayer2.cantata");
- }
- 
-+void Mpris::Pause()
-+{
-+    if (MPDState_Playing==MPDStatus::self()->state()) {
-+        StdActions::self()->playPauseTrackAction->trigger();
-+    }
-+}
-+
-+void Mpris::Play()
-+{
-+    MPDStatus * const status = MPDStatus::self();
-+    if (status->playlistLength() && MPDState_Playing!=status->state()) {
-+        StdActions::self()->playPauseTrackAction->trigger();
-+    }
-+}
-+
-+QString Mpris::PlaybackStatus() const
-+{
-+    switch(MPDStatus::self()->state()) {
-+    case MPDState_Playing: return QLatin1String("Playing");
-+    case MPDState_Paused: return QLatin1String("Paused");
-+    default:
-+    case MPDState_Stopped: return QLatin1String("Stopped");
-+    }
-+}
-+
- qlonglong Mpris::Position() const
- {
-     // Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
-diff --git a/dbus/mpris.h b/dbus/mpris.h
-index 64a4fbe..a1578b9 100644
---- a/dbus/mpris.h
-+++ b/dbus/mpris.h
-@@ -71,37 +71,15 @@ class Mpris : public QObject
-     // org.mpris.MediaPlayer2.Player
-     void Next() { StdActions::self()->nextTrackAction->trigger(); }
-     void Previous() { StdActions::self()->prevTrackAction->trigger(); }
--    void Pause() {
--        if (MPDState_Playing==MPDStatus::self()->state()) {
--            StdActions::self()->playPauseTrackAction->trigger();
--        }
--    }
--
-+    void Pause();
-     void PlayPause() { StdActions::self()->playPauseTrackAction->trigger(); }
-     void Stop() { StdActions::self()->stopPlaybackAction->trigger(); }
-     void StopAfterCurrent() { StdActions::self()->stopAfterCurrentTrackAction->trigger(); }
--
--    void Play() {
--        MPDStatus * const status = MPDStatus::self();
--
--        if (status->playlistLength() && MPDState_Playing!=status->state()) {
--           StdActions::self()->playPauseTrackAction->trigger();
--        }
--    }
--
-+    void Play();
-     void Seek(qlonglong pos) { emit setSeekId(-1, pos/1000000); }
-     void SetPosition(const QDBusObjectPath &, qlonglong pos) {emit setSeekId(-1, pos/1000000); }
-     void OpenUri(const QString &) { }
--
--    QString PlaybackStatus() {
--        switch(MPDStatus::self()->state()) {
--        case MPDState_Playing: return QLatin1String("Playing");
--        case MPDState_Paused: return QLatin1String("Paused");
--        default:
--        case MPDState_Stopped: return QLatin1String("Stopped");
--        }
--    }
--
-+    QString PlaybackStatus() const;
-     QString LoopStatus() { return MPDStatus::self()->repeat() ? QLatin1String("Playlist") : QLatin1String("None"); }
-     void SetLoopStatus(const QString &s) { emit setRepeat(QLatin1String("None")!=s); }
-     QVariantMap Metadata() const;
-@@ -115,11 +93,11 @@ class Mpris : public QObject
-     double MinimumRate() const { return 1.0; }
-     double MaximumRate() const { return 1.0; }
-     bool CanControl() const { return true; }
--    bool CanPlay() const { return MPDState_Playing!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>0; }
--    bool CanPause() const { return MPDState_Playing==MPDStatus::self()->state(); }
--    bool CanSeek() const { return -1!=MPDStatus::self()->songId(); }
--    bool CanGoNext() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
--    bool CanGoPrevious() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
-+    bool CanPlay() const { return true; }
-+    bool CanPause() const { return true; }
-+    bool CanSeek() const { return true; }
-+    bool CanGoNext() const { return true; }
-+    bool CanGoPrevious() const { return true; }
- 
-     // org.mpris.MediaPlayer2
-     bool CanQuit() const { return true; }
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
deleted file mode 100644
index de90cd684509..000000000000
--- a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
-index fcdaf5c..f6160f0 100644
---- a/support/CMakeLists.txt
-+++ b/support/CMakeLists.txt
-@@ -89,7 +89,7 @@ if (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
- 
-     add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS})
- 
--    if (X11_FOUND)
-+    if (NOT ENABLE_QT5 AND X11_FOUND)
-         target_link_libraries(support ${X11_LIBRARIES})
--    endif (X11_FOUND)
-+    endif (NOT ENABLE_QT5 AND X11_FOUND)
- endif (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)