Attachment #95937 for bug #134441

View | Details | Raw Unified | Return to bug 134441
Collapse All | Expand All




#

PORTNAME=	esperanza
PORTVERSION=	0.4.0
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	http://exodus.xmms.se/~tru/esperanza/0.4/

MAINTAINER=	alexbl@FreeBSD.org
COMMENT=	Advanced QT4 XMMS2 client

LIB_DEPENDS=	xmmsclient++.3:${PORTSDIR}/audio/cpp-xmms2
RUN_DEPENDS=	${LOCALBASE}/lib/libxmmsclient++.so.3:${PORTSDIR}/audio/cpp-xmms2

BROKEN=		does not build

USE_QT_VER=	4
QT_COMPONENTS=	gui xml network imageformats_run \
		qmake_build moc_build rcc_build uic_build
HAS_CONFIGURE=	yes
QT_NONSTANDARD=	yes
USE_GMAKE=	yes
CONFIGURE_ARGS+=--prefix=${PREFIX} --disable-growl
MAKE_JOBS_SAFE=	yes

PLIST_FILES=	bin/esperanza

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
		${QMAKE} -unix PREFIX=${PREFIX} esperanza.pro

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)ports/audio/esperanza/distinfo (-3 / +3 lines)
1	MD5 (esperanza-0.3.tar.gz) = 4a6c23d2e4f73af2d2143e1e0f5ea766	1	MD5 (esperanza-0.4.0.tar.gz) = 0b97576cee5d89a58aef9a6754d3fb00
2	SHA256 (esperanza-0.3.tar.gz) = c365c22c0154f15a83951e287068faf0b862ae017a7b402ed34e0ca85cde3ae6	2	SHA256 (esperanza-0.4.0.tar.gz) = 81402074e03160cf2f093a31565b040bf2206f0c8e89b8d4088d1ecbcf519359
3	SIZE (esperanza-0.3.tar.gz) = 211618	3	SIZE (esperanza-0.4.0.tar.gz) = 238337




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/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 &);


Return to bug 134441

Lines 6-33 Link Here

(-)ports/audio/esperanza/Makefile (-12 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= esperanza	8	PORTNAME= esperanza
9	PORTVERSION= 0.3	9	PORTVERSION= 0.4.0
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://xmms2.xmms.se/~tru/esperanza/0.3/	11	MASTER_SITES= http://exodus.xmms.se/~tru/esperanza/0.4/
13		12
14	MAINTAINER= alexbl@FreeBSD.org	13	MAINTAINER= alexbl@FreeBSD.org
15	COMMENT= Advanced QT4 XMMS2 client	14	COMMENT= Advanced QT4 XMMS2 client
16		15
17	BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.3:${PORTSDIR}/audio/cpp-xmms2	16	LIB_DEPENDS= xmmsclient++.3:${PORTSDIR}/audio/cpp-xmms2
18	RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.3:${PORTSDIR}/audio/cpp-xmms2
19
20	BROKEN= does not build
21		17
22	USE_QT_VER= 4	18	USE_QT_VER= 4
23	QT_COMPONENTS= gui moc qmake rcc uic xml network imageformats	19	QT_COMPONENTS= gui xml network imageformats_run \
		20	qmake_build moc_build rcc_build uic_build
24	HAS_CONFIGURE= yes	21	HAS_CONFIGURE= yes
		22	QT_NONSTANDARD= yes
25	USE_GMAKE= yes	23	USE_GMAKE= yes
		24	CONFIGURE_ARGS+=--prefix=${PREFIX} --disable-growl
		25	MAKE_JOBS_SAFE= yes
26		26
27	PLIST_FILES= bin/esperanza	27	PLIST_FILES= bin/esperanza
28		28
29	do-configure:
30	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
31	${QMAKE} -unix PREFIX=${PREFIX} esperanza.pro
32
33	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Added Link Here

(-)ports/audio/esperanza/files/patch-src_lib_playlistmodel.cpp (+42 lines)
1	diff --git a/src/lib/playlistmodel.cpp b/src/lib/playlistmodel.cpp
2	index 69a8d46..dab4967 100644
3	--- ./src/lib/playlistmodel.cpp
4	+++ ./src/lib/playlistmodel.cpp
5	@@ -27,6 +27,9 @@
6
7	#include "playlistmodel.h"
8
9	+// Used to check for Protocolversion at compiletime
10	+#include <xmmsc/xmmsc_idnumbers.h>
11	+
12	PlaylistModel::PlaylistModel (QObject parent, XClient client, const QString &name) : QAbstractItemModel (parent)
13	{
14	// m_columns.append ("#");
15	@@ -108,6 +111,19 @@ PlaylistModel::handle_pls_loaded (const std::string &name)
16	return true;
17	}
18
19	+#if (XMMS_IPC_PROTOCOL_VERSION > 10)
20	+bool
21	+PlaylistModel::handle_update_pos (const Xmms::Dict &posdict)
22	+{
23	+ QString changed_pl = XClient::stdToQ (posdict.get<std::string> ("name"));
24	+ if (changed_pl == m_name) {
25	+ uint32_t pos = posdict.get<uint32_t> ("position");
26	+ m_current_pos = pos;
27	+ emit dataChanged(index (pos, 0), index (pos, m_columns.size ()));
28	+ }
29	+ return true;
30	+}
31	+#else
32	bool
33	PlaylistModel::handle_update_pos (const uint32_t &pos)
34	{
35	@@ -115,6 +131,7 @@ PlaylistModel::handle_update_pos (const uint32_t &pos)
36	emit dataChanged(index (pos, 0), index (pos, m_columns.size ()));
37	return true;
38	}
39	+#endif
40
41	QList<QString>
42	PlaylistModel::columns () const

Added Link Here

(-)ports/audio/esperanza/files/patch-src_lib_playlistmodel.h (+16 lines)
1	diff --git a/src/lib/playlistmodel.h b/src/lib/playlistmodel.h
2	index d4f6860..eb54660 100644
3	--- ./src/lib/playlistmodel.h
4	+++ ./src/lib/playlistmodel.h
5	@@ -128,7 +128,11 @@ class PlaylistModel : public QAbstractItemModel
6	private:
7	bool handle_list (const Xmms::List< unsigned int > &list);
8	bool handle_change (const Xmms::Dict &chg);
9	+#if (XMMS_IPC_PROTOCOL_VERSION > 10)
10	+ bool handle_update_pos (const Xmms::Dict &pos);
11	+#else
12	bool handle_update_pos (const unsigned int &pos);
13	+#endif
14	bool handle_pls_loaded (const std::string &);
15	bool handle_current_pls (const std::string &);
16