rpms/esperanza/F-10 esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 sources, 1.1, 1.2
Tom Callaway
spot at fedoraproject.org
Thu Mar 5 18:54:10 UTC 2009
- Previous message: rpms/bluez/devel bluez-try-utf8-harder.patch, NONE, 1.1 bluez.spec, 1.44, 1.45
- Next message: rpms/esperanza/F-9 esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/esperanza/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27163/F-10
Modified Files:
sources
Added Files:
esperanza-0.4.0-gitfixes20081204.patch esperanza.desktop
esperanza.png esperanza.spec
Log Message:
initial branching
esperanza-0.4.0-gitfixes20081204.patch:
--- NEW FILE esperanza-0.4.0-gitfixes20081204.patch ---
diff -urP esperanza-0.4.0.OLD/config.pri esperanza-0.4.0/config.pri
--- esperanza-0.4.0.OLD/config.pri 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/config.pri 2008-12-04 18:25:09.000000000 -0500
@@ -7,6 +7,7 @@
INCLUDEPATH += /opt/local/include # ugly
DEFINES += HAVE_DNSSD
LIBS += -lboost_signals
+ QMAKE_LFLAGS_SHAPP += -bind_at_load
}
!win32 {
diff -urP esperanza-0.4.0.OLD/data/text/about.html esperanza-0.4.0/data/text/about.html
--- esperanza-0.4.0.OLD/data/text/about.html 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/data/text/about.html 2008-12-04 18:25:09.000000000 -0500
@@ -6,7 +6,7 @@
<p>Frequent Contributor: Thilo Cestonaro <<a href="mailto:c.thilo at gmx.de">c.thilo at gmx.de</a>></p>
<p>Contributor: Gianluca Romanin <<a href="mailto:j_zar at openjay.org">j_zar at openjay.org</a>></p>
<p>Contributor: Auke Schrijnen <<a href="mailto:auke at schrijnen.nl">auke at schrijnen.nl</a>></p>
-<p>Contributor: Anders Gustafsson <<a href="mailto:andersg at xmms.org">andersg at xmms.org</a>></p>
+<p>Contributor: Anders Waldenborg <<a href="mailto:andersg at xmms.org">andersg at xmms.org</a>></p>
<p>Contributor: Sebastien Cevey <<a href="mailto:seb at cine7.net">seb at cine7.net</a>></p>
<p>Contributor: Georg Schild <<a href="mailto:dangertools at gmx.at">dangertools at gmx.at</a>></p>
<p>Contributor: Dan Chokola <<a href="mailto:dan at chokola.com">dan at chokola.com</a>></p>
diff -urP esperanza-0.4.0.OLD/esperanza.tmproj esperanza-0.4.0/esperanza.tmproj
--- esperanza-0.4.0.OLD/esperanza.tmproj 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/esperanza.tmproj 2008-12-04 18:25:09.000000000 -0500
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>currentDocument</key>
- <string>src/ui/playerwidget.cpp</string>
+ <string>src/lib/collectioninfomodel.cpp</string>
<key>documents</key>
<array>
<dict>
@@ -18,7 +18,7 @@
</dict>
</array>
<key>fileHierarchyDrawerWidth</key>
- <integer>224</integer>
+ <integer>295</integer>
<key>metaData</key>
<dict>
<key>ChangeLog</key>
@@ -35,88 +35,162 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>src/dialogs/lastfm/plugin.h</key>
+ <key>src/dialogs/medialibdialog/medialibdialog.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>49</integer>
+ <integer>37</integer>
<key>line</key>
- <integer>26</integer>
+ <integer>39</integer>
+ </dict>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>185</integer>
+ </dict>
+ <key>src/dialogs/medialibdialog/medialibdialog.pro</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>112</integer>
+ <key>line</key>
+ <integer>4</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>src/ui/esperanza_plugin.h</key>
+ <key>src/dialogs/medialibdialog/medialibpanebrowser.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>18</integer>
+ <integer>56</integer>
<key>line</key>
- <integer>38</integer>
+ <integer>39</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>2</integer>
+ <integer>5</integer>
+ </dict>
+ <key>src/dialogs/medialibdialog/medialibview.cpp</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>0</integer>
+ <key>line</key>
+ <integer>36</integer>
+ </dict>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>0</integer>
+ </dict>
+ <key>src/dialogs/medialibdialog/panebrowserview.cpp</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>4</integer>
+ <key>line</key>
+ <integer>85</integer>
+ </dict>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>47</integer>
+ </dict>
+ <key>src/dialogs/medialibdialog/panebrowserview.h</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>0</integer>
+ <key>line</key>
+ <integer>0</integer>
+ </dict>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>4</integer>
</dict>
- <key>src/ui/main.cpp</key>
+ <key>src/lib/collectioninfomodel.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>2</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>34</integer>
+ <integer>44</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>73</integer>
+ <integer>23</integer>
</dict>
- <key>src/ui/playerwidget.cpp</key>
+ <key>src/lib/collectionmodel.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>2</integer>
+ <integer>20</integer>
<key>line</key>
- <integer>209</integer>
+ <integer>72</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>176</integer>
+ <integer>39</integer>
</dict>
- <key>src/ui/playerwidget.h</key>
+ <key>src/ui/esperanza_plugin.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>27</integer>
+ <integer>18</integer>
<key>line</key>
- <integer>32</integer>
+ <integer>38</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
+ <integer>2</integer>
+ </dict>
+ <key>src/ui/ui.pro</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>0</integer>
+ <key>line</key>
[...1797 lines suppressed...]
void gotConnection (XClient *);
Only in esperanza-0.4.0.OLD/src/ui: growl.cpp
Only in esperanza-0.4.0.OLD/src/ui: growl.h
Only in esperanza-0.4.0.OLD/src/ui: mac_growl.h
Only in esperanza-0.4.0.OLD/src/ui: mac_growl.mm
diff -urP esperanza-0.4.0.OLD/src/ui/main.cpp esperanza-0.4.0/src/ui/main.cpp
--- esperanza-0.4.0.OLD/src/ui/main.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/main.cpp 2008-12-04 18:25:09.000000000 -0500
@@ -40,6 +40,7 @@
Q_IMPORT_PLUGIN(aboutdialog)
Q_IMPORT_PLUGIN(preferencesdialog)
Q_IMPORT_PLUGIN(xmms2dpreferences)
+Q_IMPORT_PLUGIN(equalizerdialog)
int
main (int argc, char **argv)
Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.cpp
Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.h
diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.cpp esperanza-0.4.0/src/ui/playerwidget.cpp
--- esperanza-0.4.0.OLD/src/ui/playerwidget.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/playerwidget.cpp 2008-12-04 18:25:09.000000000 -0500
@@ -46,7 +46,11 @@
#include "shortcutmanager.h"
#include "esperanza_plugin.h"
+
PlayerWidget::PlayerWidget (QWidget *parent, XClient *client) : QMainWindow (parent)
+#ifdef Q_WS_MAC
+, macMenuBar(0)
+#endif
{
QSettings s;
@@ -54,7 +58,6 @@
setWindowTitle ("Esperanza");
setFocusPolicy (Qt::StrongFocus);
- setAttribute (Qt::WA_DeleteOnClose);
QWidget *main_w = new QWidget (this);
setCentralWidget (main_w);
@@ -194,6 +197,16 @@
/* Process the plugins ... */
process_dialog_plugin ();
+
+ #ifdef Q_WS_MAC
+ m_infomenu.setTitle(tr("Info"));
+ // m_playlistmenu.setTitle(tr("Playlist"));
+ m_settingsmenu.setTitle(tr("Extras"));
+
+ macMenuBar.addMenu(&m_infomenu);
+ // macMenuBar.addMenu(&m_playlistmenu);
+ macMenuBar.addMenu(&m_settingsmenu);
+ #endif
}
void
diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.h esperanza-0.4.0/src/ui/playerwidget.h
--- esperanza-0.4.0.OLD/src/ui/playerwidget.h 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/playerwidget.h 2008-12-04 18:25:09.000000000 -0500
@@ -116,6 +116,9 @@
SystemTray *m_systray;
MiniMode *m_mini;
+ #ifdef Q_WS_MAC
+ QMenuBar macMenuBar;
+ #endif
QMenu m_infomenu;
QMenu m_playlistmenu;
QMenu m_settingsmenu;
diff -urP esperanza-0.4.0.OLD/src/ui/progressframe.cpp esperanza-0.4.0/src/ui/progressframe.cpp
--- esperanza-0.4.0.OLD/src/ui/progressframe.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/progressframe.cpp 2008-12-04 18:25:09.000000000 -0500
@@ -41,7 +41,8 @@
ProgressFrame::ProgressFrame (QWidget *parent, XClient *client, bool seek) :
QFrame( parent ),
- m_reverse( false )
+ m_reverse( false ),
+ m_move( false )
{
m_client = client;
m_maxValue = 0;
diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.cpp esperanza-0.4.0/src/ui/systemtray.cpp
--- esperanza-0.4.0.OLD/src/ui/systemtray.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/systemtray.cpp 2008-12-04 18:25:09.000000000 -0500
@@ -64,12 +64,6 @@
setContextMenu (systray_menu);
connect (client, SIGNAL (gotConnection (XClient *)), this, SLOT (got_connection (XClient *)));
-#ifdef Q_WS_MACX
- m_growl = new GrowlNotifier (this, "Esperanza", QStringList ("New song"));
- m_growl->do_registration ();
-#else
- m_growl = NULL;
-#endif
}
@@ -138,14 +132,11 @@
if (m_display_action) {
m_display_action->setText (message);
}
+
setToolTip(message);
if (s.value ("core/donotification").toBool ()) {
- if (m_growl) {
- m_growl->do_notification ("New song", title, message, img);
- } else {
- showMessage (title, message, icon, milliseconds);
- }
+ showMessage (title, message, icon, milliseconds);
}
}
}
diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.h esperanza-0.4.0/src/ui/systemtray.h
--- esperanza-0.4.0.OLD/src/ui/systemtray.h 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/systemtray.h 2008-12-04 18:25:09.000000000 -0500
@@ -23,8 +23,6 @@
#include <QSystemTrayIcon>
#include <QAction>
-#include "growl.h"
-
class SystemTray : public QSystemTrayIcon
{
Q_OBJECT
@@ -45,7 +43,6 @@
QAction *m_display_action;
QAction *m_hide_action;
QAction *m_play_action;
- GrowlNotifier *m_growl;
QString m_last_notif_str;
XClient *m_client;
};
diff -urP esperanza-0.4.0.OLD/src/ui/ui.pro esperanza-0.4.0/src/ui/ui.pro
--- esperanza-0.4.0.OLD/src/ui/ui.pro 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/ui.pro 2008-12-04 18:25:09.000000000 -0500
@@ -6,7 +6,7 @@
DIALOGS += lastfm medialibdialog \
streamingdialog firsttimewizard \
preferencesdialog aboutdialog \
- xmms2dpreferences
+ xmms2dpreferences equalizer
TOOLS += grepshortcutkeydlg globalshortcut
@@ -41,8 +41,6 @@
macx {
TARGET = Esperanza
- SOURCES += mac_growl.mm
- HEADERS += mac_growl.h
}
@@ -50,9 +48,7 @@
minimode.cpp \
shortcutmanager.cpp \
filedialog.cpp \
- panebrowserview.cpp \
systemtray.cpp \
- growl.cpp \
playerbutton.cpp \
progressframe.cpp \
volumebar.cpp \
@@ -66,10 +62,8 @@
HEADERS += esperanza_plugin.h \
fancyplaylistview.h \
filedialog.h \
- growl.h \
mdns.h \
minimode.h \
- panebrowserview.h \
playerbutton.h \
playerwidget.h \
playlistview.h \
diff -urP esperanza-0.4.0.OLD/src/ui/volumebar.cpp esperanza-0.4.0/src/ui/volumebar.cpp
--- esperanza-0.4.0.OLD/src/ui/volumebar.cpp 2007-08-13 06:00:40.000000000 -0400
+++ esperanza-0.4.0/src/ui/volumebar.cpp 2008-12-04 18:25:09.000000000 -0500
@@ -24,7 +24,7 @@
#include <QApplication>
#include <QSettings>
-VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent)
+VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent), m_channels (0)
{
m_client = client;
@@ -121,7 +121,7 @@
{
if (m_channels == 1) {
m_client->playback ()->volumeSet ("master", vol) ();
- } else {
+ } else if (m_channels == 2) {
m_client->playback ()->volumeSet ("left", vol) ();
m_client->playback ()->volumeSet ("right", vol) ();
}
--- NEW FILE esperanza.desktop ---
[Desktop Entry]
Version=1.0
Name=Esperanza
GenericName=Audio Player
Comment=Play and organize your audio collection
Exec=xmms2-client-launcher.sh esperanza
Icon=esperanza
StartupNotify=false
Terminal=false
Type=Application
Categories=Audio;Music;Player;AudioVideo;
X-Desktop-File-Install-Version=0.15
--- NEW FILE esperanza.spec ---
Name: esperanza
Summary: A graphical audio player
Version: 0.4.0
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source0: http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# Derived from the included image in data/images
Source2: %{name}.png
Patch0: esperanza-0.4.0-gitfixes20081204.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: desktop-file-utils
%description
Esperanza is an audio player for the XMMS2 framework written with C++ and QT4.
It has a sleek, uncomplicated UI, and supports album art in the playlist.
%prep
%setup -q
%patch0 -p1 -b .gitfixes
# Don't need exec perms here
chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel*
%build
./configure --prefix=%{_prefix}
# Rebuild translation files
pushd data/translations
rm -rf *.qm
for i in *.ts; do
lrelease-qt4 $i
done
popd
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING COPYING.GPL data/text/*.html
%{_bindir}/%{name}*
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*.desktop
%changelog
* Thu Mar 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-2
- rebuild translations from source
* Thu Dec 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-1
- Initial package for Fedora
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esperanza/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Mar 2009 18:39:38 -0000 1.1
+++ sources 5 Mar 2009 18:53:40 -0000 1.2
@@ -0,0 +1 @@
+0b97576cee5d89a58aef9a6754d3fb00 esperanza-0.4.0.tar.gz
- Previous message: rpms/bluez/devel bluez-try-utf8-harder.patch, NONE, 1.1 bluez.spec, 1.44, 1.45
- Next message: rpms/esperanza/F-9 esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list