diff options
| -rw-r--r-- | audio/esperanza/Makefile | 6 | ||||
| -rw-r--r-- | audio/esperanza/distinfo | 6 | ||||
| -rw-r--r-- | audio/esperanza/files/patch-src_lib_playlistmodel.cpp | 42 | ||||
| -rw-r--r-- | audio/esperanza/files/patch-src_lib_playlistmodel.h | 16 |
4 files changed, 7 insertions, 63 deletions
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile index 264fcb1f5a1d..309346d31d25 100644 --- a/audio/esperanza/Makefile +++ b/audio/esperanza/Makefile @@ -6,9 +6,11 @@ # PORTNAME= esperanza -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.0.20090708 +DISTVERSIONSUFFIX=.87360cd CATEGORIES= audio -MASTER_SITES= http://exodus.xmms.se/~tru/esperanza/0.4/ +#MASTER_SITES= http://exodus.xmms.se/~tru/esperanza/0.4/ +MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= Advanced QT4 XMMS2 client diff --git a/audio/esperanza/distinfo b/audio/esperanza/distinfo index ed8ed3c972d9..c4a874f0e065 100644 --- a/audio/esperanza/distinfo +++ b/audio/esperanza/distinfo @@ -1,3 +1,3 @@ -MD5 (esperanza-0.4.0.tar.gz) = 0b97576cee5d89a58aef9a6754d3fb00 -SHA256 (esperanza-0.4.0.tar.gz) = 81402074e03160cf2f093a31565b040bf2206f0c8e89b8d4088d1ecbcf519359 -SIZE (esperanza-0.4.0.tar.gz) = 238337 +MD5 (esperanza-0.4.0.20090708.87360cd.tar.gz) = 1a920da9b7f0b1b40c643f78e247e4b8 +SHA256 (esperanza-0.4.0.20090708.87360cd.tar.gz) = 990908906cae09e19a0a4fd454cf8ef0c23d5d1f5fd721d5447b37b5182c87e4 +SIZE (esperanza-0.4.0.20090708.87360cd.tar.gz) = 233222 diff --git a/audio/esperanza/files/patch-src_lib_playlistmodel.cpp b/audio/esperanza/files/patch-src_lib_playlistmodel.cpp deleted file mode 100644 index 4629077b50f7..000000000000 --- a/audio/esperanza/files/patch-src_lib_playlistmodel.cpp +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/lib/playlistmodel.cpp b/src/lib/playlistmodel.cpp -index 69a8d46..dab4967 100644 ---- ./src/lib/playlistmodel.cpp -+++ ./src/lib/playlistmodel.cpp -@@ -27,6 +27,9 @@ - - #include "playlistmodel.h" - -+// Used to check for Protocolversion at compiletime -+#include <xmmsc/xmmsc_idnumbers.h> -+ - PlaylistModel::PlaylistModel (QObject *parent, XClient *client, const QString &name) : QAbstractItemModel (parent) - { - // m_columns.append ("#"); -@@ -108,6 +111,19 @@ PlaylistModel::handle_pls_loaded (const std::string &name) - return true; - } - -+#if (XMMS_IPC_PROTOCOL_VERSION > 10) -+bool -+PlaylistModel::handle_update_pos (const Xmms::Dict &posdict) -+{ -+ QString changed_pl = XClient::stdToQ (posdict.get<std::string> ("name")); -+ if (changed_pl == m_name) { -+ uint32_t pos = posdict.get<uint32_t> ("position"); -+ m_current_pos = pos; -+ emit dataChanged(index (pos, 0), index (pos, m_columns.size ())); -+ } -+ return true; -+} -+#else - bool - PlaylistModel::handle_update_pos (const uint32_t &pos) - { -@@ -115,6 +131,7 @@ PlaylistModel::handle_update_pos (const uint32_t &pos) - emit dataChanged(index (pos, 0), index (pos, m_columns.size ())); - return true; - } -+#endif - - QList<QString> - PlaylistModel::columns () const diff --git a/audio/esperanza/files/patch-src_lib_playlistmodel.h b/audio/esperanza/files/patch-src_lib_playlistmodel.h deleted file mode 100644 index 361cb65073d0..000000000000 --- a/audio/esperanza/files/patch-src_lib_playlistmodel.h +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/lib/playlistmodel.h b/src/lib/playlistmodel.h -index d4f6860..eb54660 100644 ---- ./src/lib/playlistmodel.h -+++ ./src/lib/playlistmodel.h -@@ -128,7 +128,11 @@ class PlaylistModel : public QAbstractItemModel - private: - bool handle_list (const Xmms::List< unsigned int > &list); - bool handle_change (const Xmms::Dict &chg); -+#if (XMMS_IPC_PROTOCOL_VERSION > 10) -+ bool handle_update_pos (const Xmms::Dict &pos); -+#else - bool handle_update_pos (const unsigned int &pos); -+#endif - bool handle_pls_loaded (const std::string &); - bool handle_current_pls (const std::string &); - |