rpms/esperanza/devel esperanza-0.4.0-gitfixes20090811.patch, NONE, 1.1 esperanza.spec, 1.2, 1.3
Tom Callaway
spot at fedoraproject.org
Tue Aug 11 20:54:43 UTC 2009
- Previous message: rpms/roxterm/devel .cvsignore, 1.16, 1.17 roxterm.spec, 1.17, 1.18 sources, 1.16, 1.17
- Next message: rpms/gxmms2/devel .cvsignore, 1.2, 1.3 gxmms2.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/esperanza/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14758
Modified Files:
esperanza.spec
Added Files:
esperanza-0.4.0-gitfixes20090811.patch
Log Message:
update for xmms 0.6
esperanza-0.4.0-gitfixes20090811.patch:
esperanza-0.4.0/src/ui/growl.cpp |only
esperanza-0.4.0/src/ui/growl.h |only
esperanza-0.4.0/src/ui/mac_growl.h |only
esperanza-0.4.0/src/ui/mac_growl.mm |only
esperanza-0.4.0/src/ui/panebrowserview.cpp |only
esperanza-0.4.0/src/ui/panebrowserview.h |only
esperanza/src/dialogs/equalizer/equalizerdialog.cpp | 6 +++--
esperanza/src/dialogs/lastfm/lastfm.cpp | 10 +++------
esperanza/src/dialogs/lastfm/lastfm.h | 2 -
esperanza/src/dialogs/medialibdialog/medialibdialog.cpp | 8 ++++---
esperanza/src/dialogs/streamingdialog/streamingdialog.cpp | 14 +++++++------
esperanza/src/lib/collectioninfomodel.cpp | 8 ++++---
esperanza/src/lib/collectionmodel.cpp | 11 ++++++----
esperanza/src/lib/collectionmodel.h | 2 -
esperanza/src/lib/misc.cpp | 2 -
esperanza/src/lib/playlistmodel.cpp | 15 +++++++-------
esperanza/src/lib/playlistmodel.h | 2 -
esperanza/src/lib/xclient.cpp | 8 +++----
18 files changed, 49 insertions(+), 39 deletions(-)
--- NEW FILE esperanza-0.4.0-gitfixes20090811.patch ---
diff -urP esperanza-0.4.0/src/dialogs/equalizer/equalizerdialog.cpp esperanza/src/dialogs/equalizer/equalizerdialog.cpp
--- esperanza-0.4.0/src/dialogs/equalizer/equalizerdialog.cpp 2009-08-11 16:38:06.055368203 -0400
+++ esperanza/src/dialogs/equalizer/equalizerdialog.cpp 2009-08-11 16:37:14.347236289 -0400
@@ -149,8 +149,10 @@
{
bool effects = false;
- for (dl.first (); dl.isValid (); ++dl) {
- Xmms::Dict d = *dl;
+ Xmms::List< Xmms::Dict >::const_iterator it_end = dl.end();
+ for (Xmms::List< Xmms::Dict >::const_iterator it = dl.begin();
+ it != it_end; ++it) {
+ Xmms::Dict d = *it;
if (d.contains ("shortname")) {
if (d.get<std::string> ("shortname") == "equalizer") {
effects = true;
diff -urP esperanza-0.4.0/src/dialogs/lastfm/lastfm.cpp esperanza/src/dialogs/lastfm/lastfm.cpp
--- esperanza-0.4.0/src/dialogs/lastfm/lastfm.cpp 2009-08-11 16:38:06.062361134 -0400
+++ esperanza/src/dialogs/lastfm/lastfm.cpp 2009-08-11 16:37:14.352236158 -0400
@@ -31,6 +31,8 @@
#include <QCursor>
#include <QDesktopServices>
+#include <algorithm>
+
#define LASTFM_SEARCH_URL "http://www.last.fm/music/?m=artists&q=%1"
#define MUSICBRAINZ_URL "http://musicbrainz.org/artist/%1.html"
@@ -257,13 +259,9 @@
}
bool
-LastFmDialog::num_reply (Xmms::List<unsigned int> const &list, const QString &artist)
+LastFmDialog::num_reply (Xmms::List<int> const &list, const QString &artist)
{
- int num = 0;
- /* we have to loop the list inorder to get the lenght :-( */
- for (list.first (); list.isValid (); ++list) {
- num ++;
- }
+ int num = std::distance(list.begin(), list.end());
if (num == 0) {
return false;
diff -urP esperanza-0.4.0/src/dialogs/lastfm/lastfm.h esperanza/src/dialogs/lastfm/lastfm.h
--- esperanza-0.4.0/src/dialogs/lastfm/lastfm.h 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/lastfm/lastfm.h 2009-08-11 16:37:14.352236158 -0400
@@ -61,7 +61,7 @@
QProgressBar *m_pb;
QLabel *m_pl;
- bool num_reply (Xmms::List<unsigned int> const &list, const QString &artist);
+ bool num_reply (Xmms::List<int> const &list, const QString &artist);
QString m_current_artist;
diff -urP esperanza-0.4.0/src/dialogs/medialibdialog/medialibdialog.cpp esperanza/src/dialogs/medialibdialog/medialibdialog.cpp
--- esperanza-0.4.0/src/dialogs/medialibdialog/medialibdialog.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/medialibdialog/medialibdialog.cpp 2009-08-11 16:37:14.353236215 -0400
@@ -194,10 +194,12 @@
{
QStringList compl_list;
- for (list.first (); list.isValid (); ++ list) {
+ Xmms::List <Xmms::Dict>::const_iterator it_end = list.end();
+ for (Xmms::List <Xmms::Dict>::const_iterator it = list.begin();
+ it != it_end; ++ it) {
/* This seems to happen if a album is "" */
- if ((*list).contains (m_currentsel)) {
- QString qs = XClient::stdToQ ((*list).get<std::string> (m_currentsel));
+ if (it->contains (m_currentsel)) {
+ QString qs = XClient::stdToQ (it->get<std::string> (m_currentsel));
compl_list.append (qs);
}
}
diff -urP esperanza-0.4.0/src/dialogs/streamingdialog/streamingdialog.cpp esperanza/src/dialogs/streamingdialog/streamingdialog.cpp
--- esperanza-0.4.0/src/dialogs/streamingdialog/streamingdialog.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/streamingdialog/streamingdialog.cpp 2009-08-11 16:37:14.360236339 -0400
@@ -400,12 +400,14 @@
bool
StreamingBookmarks::handle_list (const Xmms::List<std::string> &list)
{
- bool r = false;
- for (list.first (); list.isValid (); ++list) {
- if (*list == "_esperanza_bookmarks") {
- r = true;
- break;
- }
+ bool r = false;
+ Xmms::List<std::string>::const_iterator it_end = list.end();
+ for (Xmms::List<std::string>::const_iterator it = list.begin();
+ it != it_end; ++it) {
+ if (*it == "_esperanza_bookmarks") {
+ r = true;
+ break;
+ }
}
if (!r) {
diff -urP esperanza-0.4.0/src/lib/collectioninfomodel.cpp esperanza/src/lib/collectioninfomodel.cpp
--- esperanza-0.4.0/src/lib/collectioninfomodel.cpp 2009-08-11 16:38:06.066361504 -0400
+++ esperanza/src/lib/collectioninfomodel.cpp 2009-08-11 16:37:14.362236245 -0400
@@ -49,12 +49,14 @@
{
/* convert the first entry in the list to get the headers */
QList < QHash < QString, QVariant > > l;
- for (list.first (); list.isValid (); ++list) {
- QHash<QString, QVariant> h = XClient::convert_dict (*list);
+ Xmms::List<Xmms::Dict>::const_iterator it_end = list.end();
+ for (Xmms::List<Xmms::Dict>::const_iterator it = list.begin();
+ it != it_end; ++it) {
+ QHash<QString, QVariant> h = XClient::convert_dict (*it);
l.append (h);
}
set_data (l);
-
+
return true;
}
diff -urP esperanza-0.4.0/src/lib/collectionmodel.cpp esperanza/src/lib/collectionmodel.cpp
--- esperanza-0.4.0/src/lib/collectionmodel.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/collectionmodel.cpp 2009-08-11 16:37:14.362236245 -0400
@@ -74,20 +74,23 @@
}
bool
-CollectionModel::id_list_get (Xmms::List<unsigned int> const &list)
+CollectionModel::id_list_get (Xmms::List<int> const &list)
{
beginRemoveRows (QModelIndex (), 0, m_plist.size ());
m_plist.clear ();
endRemoveRows ();
int i = 0;
- for (list.first (); list.isValid (); ++list) {
+ Xmms::List<int>::const_iterator it_end = list.end();
+ for (Xmms::List<int>::const_iterator it = list.begin();
+ it != it_end; ++it) {
i ++;
}
beginInsertRows (QModelIndex (), 0, i);
- for (list.first (); list.isValid (); ++list) {
- m_plist.append (*list);
+ for (Xmms::List<int>::const_iterator it = list.begin();
+ it != it_end; ++it) {
+ m_plist.append (*it);
}
endInsertRows ();
diff -urP esperanza-0.4.0/src/lib/collectionmodel.h esperanza/src/lib/collectionmodel.h
--- esperanza-0.4.0/src/lib/collectionmodel.h 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/collectionmodel.h 2009-08-11 16:37:14.362236245 -0400
@@ -57,7 +57,7 @@
private:
XClient *m_client;
- bool id_list_get (Xmms::List<unsigned int> const &);
+ bool id_list_get (Xmms::List<int> const &);
bool collptr_get (Xmms::Coll::Coll const &);
QList<unsigned int> m_plist;
diff -urP esperanza-0.4.0/src/lib/misc.cpp esperanza/src/lib/misc.cpp
--- esperanza-0.4.0/src/lib/misc.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/misc.cpp 2009-08-11 16:37:14.363236163 -0400
@@ -60,7 +60,7 @@
goto browser;
} else {
QErrorMessage *err = new QErrorMessage (parent);
- err->showMessage ("Your XMMS_PATH enviroment sucks. Fix it and restart the Application");
+ err->showMessage ("Your XMMS_PATH environment sucks. Fix it and restart the Application");
err->exec ();
return false;
}
diff -urP esperanza-0.4.0/src/lib/playlistmodel.cpp esperanza/src/lib/playlistmodel.cpp
--- esperanza-0.4.0/src/lib/playlistmodel.cpp 2009-08-11 16:38:06.067363866 -0400
+++ esperanza/src/lib/playlistmodel.cpp 2009-08-11 16:37:14.363236163 -0400
@@ -25,6 +25,8 @@
#include <QUrl>
#include <QFileInfo>
+#include <algorithm>
+
#include "playlistmodel.h"
// Used to check for Protocolversion at compiletime
@@ -223,19 +225,18 @@
}
bool
-PlaylistModel::handle_list (const Xmms::List< unsigned int > &list)
+PlaylistModel::handle_list (const Xmms::List< int > &list)
{
beginRemoveRows (QModelIndex (), 0, m_plist.size ());
m_plist.clear ();
endRemoveRows ();
- int i = 0;
- for (list.first (); list.isValid (); ++list) {
- i ++;
- }
+ Xmms::List< int >::const_iterator it_end = list.end();
+ int i = std::distance(list.begin(), it_end);
beginInsertRows (QModelIndex (), 0, i);
- for (list.first (); list.isValid (); ++list) {
- m_plist.append (*list);
+ for (Xmms::List< int >::const_iterator it = list.begin();
+ it != it_end; ++it) {
+ m_plist.append (*it);
}
endInsertRows ();
diff -urP esperanza-0.4.0/src/lib/playlistmodel.h esperanza/src/lib/playlistmodel.h
--- esperanza-0.4.0/src/lib/playlistmodel.h 2009-08-11 16:38:06.068361479 -0400
+++ esperanza/src/lib/playlistmodel.h 2009-08-11 16:37:14.363236163 -0400
@@ -126,7 +126,7 @@
void entry_changed (uint32_t);
private:
- bool handle_list (const Xmms::List< unsigned int > &list);
+ bool handle_list (const Xmms::List< int > &list);
bool handle_change (const Xmms::Dict &chg);
#if (XMMS_IPC_PROTOCOL_VERSION > 10)
bool handle_update_pos (const Xmms::Dict &pos);
diff -urP esperanza-0.4.0/src/lib/xclient.cpp esperanza/src/lib/xclient.cpp
--- esperanza-0.4.0/src/lib/xclient.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/xclient.cpp 2009-08-11 16:37:14.364241458 -0400
@@ -179,13 +179,13 @@
QString val;
if (key == "url") {
/* This really is wrong ...*/
- char *c = const_cast<char *>(xmmsc_result_decode_url (NULL, boost::get< std::string >(value).c_str ()));
- val = QString::fromUtf8 (c);
+ //char *c = const_cast<char *>(xmmsc_result_decode_url (NULL, boost::get< std::string >(value).c_str ()));
+ std::string c(Xmms::decodeUrl(boost::get< std::string >(value)));
+ val = QString::fromStdString (c);
val = val.mid (val.lastIndexOf ("/") + 1);
if (val.isEmpty ()) {
- val = QString::fromUtf8 (c);
+ val = QString::fromStdString (c);
}
- free (c);
} else {
val = QString::fromUtf8 (boost::get< std::string > (value).c_str ());
}
Only in esperanza-0.4.0/src/ui: growl.cpp
Only in esperanza-0.4.0/src/ui: growl.h
Only in esperanza-0.4.0/src/ui: mac_growl.h
Only in esperanza-0.4.0/src/ui: mac_growl.mm
Only in esperanza-0.4.0/src/ui: panebrowserview.cpp
Only in esperanza-0.4.0/src/ui: panebrowserview.h
Index: esperanza.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esperanza/devel/esperanza.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- esperanza.spec 24 Jul 2009 22:18:50 -0000 1.2
+++ esperanza.spec 11 Aug 2009 20:54:43 -0000 1.3
@@ -1,7 +1,7 @@
Name: esperanza
Summary: A graphical audio player
Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source0: http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz
@@ -9,9 +9,10 @@ Source1: %{name}.desktop
# Derived from the included image in data/images
Source2: %{name}.png
Patch0: esperanza-0.4.0-gitfixes20081204.patch
+Patch1: esperanza-0.4.0-gitfixes20090811.patch
URL: http://wiki.xmms2.xmms.se/wiki/Client:Esperanza
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xmms2-devel, qt-devel
+BuildRequires: xmms2-devel >= 0.6, qt-devel
BuildRequires: desktop-file-utils
%description
@@ -21,6 +22,7 @@ It has a sleek, uncomplicated UI, and su
%prep
%setup -q
%patch0 -p1 -b .gitfixes
+%patch1 -p1 -b .moregit
# Don't need exec perms here
chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel*
@@ -56,6 +58,9 @@ rm -rf %{buildroot}
%{_datadir}/applications/*.desktop
%changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-4
+- sync up with latest git to support new xmms 0.6
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message: rpms/roxterm/devel .cvsignore, 1.16, 1.17 roxterm.spec, 1.17, 1.18 sources, 1.16, 1.17
- Next message: rpms/gxmms2/devel .cvsignore, 1.2, 1.3 gxmms2.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list