public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/amarok] epel10: - amarok-2.3.1.90 (2.3.2 beta1)
@ 2026-07-06 18:04 Rex Dieter
0 siblings, 0 replies; only message in thread
From: Rex Dieter @ 2026-07-06 18:04 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10
Commit : edb219e7a06b060d5eacfd2d6da6d6de1852cccb
Author : Rex Dieter <rdieter@fedoraproject.org>
Date : 2010-08-16T09:57:29-05:00
Stats : +15/-678 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/edb219e7a06b060d5eacfd2d6da6d6de1852cccb?branch=epel10
Log:
- amarok-2.3.1.90 (2.3.2 beta1)
---
diff --git a/.gitignore b/.gitignore
index 5ef5697..71ead51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-amarok-2.3.1.tar.bz2
+amarok-2.3.1.90.tar.bz2
diff --git a/0001-Move-some-code-in-TrayIcon-class.patch b/0001-Move-some-code-in-TrayIcon-class.patch
deleted file mode 100644
index 329fdc7..0000000
--- a/0001-Move-some-code-in-TrayIcon-class.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 27f609075de02f767611d455ba3f9e29c2986001 Mon Sep 17 00:00:00 2001
-From: Kevin Funk <krf@electrostorm.net>
-Date: Fri, 28 May 2010 12:36:19 +0200
-Subject: [PATCH 1/4] Move some code in TrayIcon class.
-
----
- src/TrayIcon.cpp | 29 ++++++++++-------------------
- src/TrayIcon.h | 1 +
- 2 files changed, 11 insertions(+), 19 deletions(-)
-
-diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
-index 061bc08..fb97483 100644
---- a/src/TrayIcon.cpp
-+++ b/src/TrayIcon.cpp
-@@ -64,13 +64,13 @@ Amarok::TrayIcon::TrayIcon( QObject *parent )
-
- PERF_LOG( "Before adding actions" );
-
-- #ifdef Q_WS_MAC
-+#ifdef Q_WS_MAC
- // Add these functions to the dock icon menu in OS X
- extern void qt_mac_set_dock_menu(QMenu *);
- qt_mac_set_dock_menu( contextMenu() );
- contextMenu()->addAction( ac->action( "playlist_playmedia" ) );
- contextMenu()->addSeparator();
-- #endif
-+#endif
-
- contextMenu()->addAction( ac->action( "prev" ) );
- contextMenu()->addAction( ac->action( "play_pause" ) );
-@@ -79,8 +79,15 @@ Amarok::TrayIcon::TrayIcon( QObject *parent )
- contextMenu()->setObjectName( "TrayIconContextMenu" );
-
- PERF_LOG( "Adding system tray icon" );
-- paintIcon();
-
-+ m_baseIcon = KIconLoader::global()->loadIcon( "amarok", KIconLoader::Panel );
-+ setIconByPixmap( m_baseIcon ); // show icon
-+ setOverlayIconByName( QString() );
-+
-+ m_grayedIcon = m_baseIcon; // copies object
-+ KIconEffect::semiTransparent( m_grayedIcon );
-+
-+ paintIcon();
- setupToolTip();
-
- connect( this, SIGNAL( scrollRequested( int, Qt::Orientation ) ), SLOT( slotScrollRequested(int, Qt::Orientation) ) );
-@@ -288,22 +295,6 @@ Amarok::TrayIcon::paintIcon( qint64 trackPosition )
- {
- static qint64 oldMergePos = -1;
-
-- // start up
-- // TODO: Move these two blocks to ctor (warning: might get some regressions)
-- if( m_baseIcon.isNull() )
-- {
-- m_baseIcon = KIconLoader::global()->loadIcon( "amarok", KIconLoader::Panel );
-- setIconByPixmap( m_baseIcon ); // show icon
-- setOverlayIconByName( QString() );
-- return; // HACK: return because m_baseIcon is still null after first startup (why?)
-- }
--
-- if( m_grayedIcon.isNull() )
-- {
-- m_grayedIcon = m_baseIcon; // copies object
-- KIconEffect::semiTransparent( m_grayedIcon );
-- }
--
- // trackPosition < 0 means reset
- if( trackPosition < 0 )
- {
-diff --git a/src/TrayIcon.h b/src/TrayIcon.h
-index 46a265b..c2602df 100644
---- a/src/TrayIcon.h
-+++ b/src/TrayIcon.h
-@@ -40,6 +40,7 @@ class TrayIcon : public KStatusNotifierItem, public Engine::EngineObserver, publ
-
- public:
- TrayIcon( QObject *parent );
-+
- friend class ::App;
-
- void setVisible( bool visible );
---
-1.7.0.4
-
diff --git a/0002-Some-TrayIcon-changes.patch b/0002-Some-TrayIcon-changes.patch
deleted file mode 100644
index 29415fc..0000000
--- a/0002-Some-TrayIcon-changes.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From fec9e8f94eb3665fc7051c4eac2f94355058851d Mon Sep 17 00:00:00 2001
-From: Kevin Funk <krf@electrostorm.net>
-Date: Thu, 8 Jul 2010 12:13:00 +0200
-Subject: [PATCH 2/4] Some TrayIcon changes:
- * Remove track progress effect (this is because KSNI has some bogus
- implementation of the setIconByPixmap() function causing the overlay
- icon being wrong sized
- * Fix overlay icon size
- * Tooltip album cover is now updated if changed in Amarok
- * Cleanup
- CCBUG: 231539
- CCBUG: 232578
- CCBUG: 232312
- BUG: 233506
- BUG: 240463
-
----
- src/TrayIcon.cpp | 106 ++++++++++++------------------------------------------
- src/TrayIcon.h | 11 +-----
- 2 files changed, 25 insertions(+), 92 deletions(-)
-
-diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
-index fb97483..4bd46e4 100644
---- a/src/TrayIcon.cpp
-+++ b/src/TrayIcon.cpp
-@@ -52,7 +52,6 @@
- Amarok::TrayIcon::TrayIcon( QObject *parent )
- : KStatusNotifierItem( parent )
- , Engine::EngineObserver( The::engineController() )
-- , m_trackLength( 0 )
- , m_separator( 0 )
- {
- DEBUG_BLOCK
-@@ -80,14 +79,8 @@ Amarok::TrayIcon::TrayIcon( QObject *parent )
-
- PERF_LOG( "Adding system tray icon" );
-
-- m_baseIcon = KIconLoader::global()->loadIcon( "amarok", KIconLoader::Panel );
-- setIconByPixmap( m_baseIcon ); // show icon
-- setOverlayIconByName( QString() );
-+ setIconByName( "amarok" );
-
-- m_grayedIcon = m_baseIcon; // copies object
-- KIconEffect::semiTransparent( m_grayedIcon );
--
-- paintIcon();
- setupToolTip();
-
- connect( this, SIGNAL( scrollRequested( int, Qt::Orientation ) ), SLOT( slotScrollRequested(int, Qt::Orientation) ) );
-@@ -102,22 +95,13 @@ Amarok::TrayIcon::setupToolTip()
- setToolTipTitle( The::engineController()->prettyNowPlaying() );
-
- QStringList tooltip;
-- // TODO: Use Observer to get notified about changed album art
-- if( m_track->album() )
-+ if( m_track->album() && m_track->album()->hasImage() )
- {
- const QString uid = m_track->uidUrl();
- if ( uid != m_toolTipIconUid ) {
- const QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
-- if ( image.isNull() )
-- {
-- setToolTipIconByName( "amarok" );
-- m_toolTipIconUid.clear();
-- }
-- else
-- {
-- setToolTipIconByPixmap( image );
-- m_toolTipIconUid = uid;
-- }
-+ setToolTipIconByPixmap( image );
-+ m_toolTipIconUid = uid;
- }
- }
- else
-@@ -184,9 +168,10 @@ Amarok::TrayIcon::setupToolTip()
- else
- {
- setToolTipIconByName( "amarok" );
-- m_toolTipIconUid.clear();
- setToolTipTitle( KCmdLineArgs::aboutData()->programName() );
- setToolTipSubTitle( The::engineController()->prettyNowPlaying() );
-+
-+ m_toolTipIconUid.clear();
- }
- }
-
-@@ -206,20 +191,26 @@ Amarok::TrayIcon::engineStateChanged( Phonon::State state, Phonon::State /*oldSt
- switch( state )
- {
- case Phonon::PlayingState:
-- unsubscribeFrom( m_track );
-+ if ( m_track )
-+ {
-+ unsubscribeFrom( m_track );
-+ unsubscribeFrom( m_track->album() );
-+ }
- m_track = track;
-- m_trackLength = m_track ? m_track->length() : 0;
-- subscribeTo( track );
-+ if ( track )
-+ {
-+ subscribeTo( track );
-+ subscribeTo( track->album() );
-+ }
-
-- paintIcon( 0 );
-+ setOverlayIconByName( "media-playback-start" );
- setupMenu();
- break;
-
- case Phonon::StoppedState:
- m_track = 0;
-- m_trackLength = 0;
-
-- paintIcon();
-+ setOverlayIconByName( QString() );
- setupMenu(); // remove custom track actions on stop
- break;
-
-@@ -230,6 +221,7 @@ Amarok::TrayIcon::engineStateChanged( Phonon::State state, Phonon::State /*oldSt
- case Phonon::LoadingState:
- case Phonon::ErrorState:
- case Phonon::BufferingState:
-+ setOverlayIconByName( QString() );
- break;
- }
-
-@@ -240,9 +232,6 @@ void
- Amarok::TrayIcon::engineNewTrackPlaying()
- {
- m_track = The::engineController()->currentTrack();
-- m_trackLength = m_track ? m_track->length() : 0;
--
-- paintIcon( 0 );
-
- setupToolTip();
- setupMenu();
-@@ -258,12 +247,12 @@ Amarok::TrayIcon::metadataChanged( Meta::TrackPtr track )
- }
-
- void
--Amarok::TrayIcon::engineTrackPositionChanged( qint64 position, bool userSeek )
-+Amarok::TrayIcon::metadataChanged( Meta::AlbumPtr album )
- {
-- Q_UNUSED( userSeek );
-+ Q_UNUSED( album )
-
-- if( m_trackLength )
-- paintIcon( position );
-+ setupToolTip();
-+ setupMenu();
- }
-
- void
-@@ -283,55 +272,6 @@ Amarok::TrayIcon::engineMuteStateChanged( bool mute )
- }
-
- void
--Amarok::TrayIcon::paletteChange( const QPalette & op )
--{
-- Q_UNUSED( op );
--
-- paintIcon();
--}
--
--void
--Amarok::TrayIcon::paintIcon( qint64 trackPosition )
--{
-- static qint64 oldMergePos = -1;
--
-- // trackPosition < 0 means reset
-- if( trackPosition < 0 )
-- {
-- oldMergePos = -1;
-- setIconByPixmap( m_baseIcon );
-- setOverlayIconByName( QString() );
-- return;
-- }
--
-- // check if we are playing a stream
-- if( !m_trackLength )
-- {
-- m_icon = m_baseIcon;
-- setIconByPixmap( m_icon );
-- setOverlayIconByName( "media-playback-start" );
-- return;
-- }
--
-- const qint64 mergePos = ( float( trackPosition ) / m_trackLength ) * m_icon.height();
--
-- // return if pixmap would stay the same
-- if( oldMergePos == mergePos )
-- return;
--
-- // draw m_baseIcon on top of the gray version
-- m_icon = m_grayedIcon; // copies object
-- QPainter p( &m_icon );
-- p.drawPixmap( 0, 0, m_baseIcon, 0, 0, 0, m_icon.height() - mergePos );
-- p.end();
--
-- oldMergePos = mergePos;
--
-- setIconByPixmap( m_icon );
-- setOverlayIconByName( "media-playback-start" );
--}
--
--void
- Amarok::TrayIcon::setupMenu()
- {
- foreach( QAction* action, m_extraActions )
-diff --git a/src/TrayIcon.h b/src/TrayIcon.h
-index c2602df..d590b5f 100644
---- a/src/TrayIcon.h
-+++ b/src/TrayIcon.h
-@@ -49,16 +49,13 @@ protected:
- // reimplemented from engineobserver
- virtual void engineStateChanged( Phonon::State state, Phonon::State oldState = Phonon::StoppedState );
- virtual void engineNewTrackPlaying();
-- virtual void engineTrackPositionChanged( qint64 position, bool /*userSeek*/ );
- virtual void engineVolumeChanged( int percent );
- virtual void engineMuteStateChanged( bool mute );
-
-- //Reimplemented from Meta::Observer
-+ // reimplemented from Meta::Observer
- using Observer::metadataChanged;
- virtual void metadataChanged( Meta::TrackPtr track );
--
-- // get notified of 'highlight' color change
-- virtual void paletteChange( const QPalette & oldPalette );
-+ virtual void metadataChanged( Meta::AlbumPtr album );
-
- private slots:
- void slotActivated();
-@@ -68,13 +65,9 @@ private:
- void setupMenu();
- void setupToolTip();
-
-- void paintIcon( qint64 trackPosition = -1 );
--
- Meta::TrackPtr m_track;
-- qint64 m_trackLength;
- QString m_toolTipIconUid;
-
-- QPixmap m_baseIcon, m_grayedIcon, m_icon;
- SmartPointerList<QAction> m_extraActions;
- QPointer<QAction> m_separator;
- };
---
-1.7.0.4
-
diff --git a/0003-TrayIcon-Do-not-update-cover-each-time-we-update-the.patch b/0003-TrayIcon-Do-not-update-cover-each-time-we-update-the.patch
deleted file mode 100644
index d399ca2..0000000
--- a/0003-TrayIcon-Do-not-update-cover-each-time-we-update-the.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From 303f9b27c49efe0543b4388073374406105e917d Mon Sep 17 00:00:00 2001
-From: Kevin Funk <krf@electrostorm.net>
-Date: Thu, 8 Jul 2010 12:58:37 +0200
-Subject: [PATCH 3/4] TrayIcon: Do not update cover each time we update the tooltip. Cleanup
- includes aswell.
-
----
- src/TrayIcon.cpp | 82 +++++++++++++++++++++---------------------------------
- src/TrayIcon.h | 8 +----
- 2 files changed, 33 insertions(+), 57 deletions(-)
-
-diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
-index 4bd46e4..7398e2a 100644
---- a/src/TrayIcon.cpp
-+++ b/src/TrayIcon.cpp
-@@ -26,27 +26,19 @@
- #include "EngineController.h"
- #include "amarokconfig.h"
- #include "GlobalCurrentTrackActions.h"
--#include "core/meta/support/MetaConstants.h"
- #include "core/capabilities/CurrentTrackActionsCapability.h"
- #include "playlist/PlaylistActions.h"
--#include "playlist/PlaylistModelStack.h"
- #include "SvgHandler.h"
- #include <KAboutData>
- #include <KAction>
- #include <KCmdLineArgs>
--#include <KIcon>
--#include <KIconEffect>
- #include <KLocale>
- #include <KMenu>
- #include <KStandardDirs>
-
- #include <QAction>
--#include <QEvent>
- #include <QFontMetrics>
--#include <QMouseEvent>
--#include <QPainter>
- #include <QPixmap>
--#include <QTime>
- #include <QToolTip>
-
- Amarok::TrayIcon::TrayIcon( QObject *parent )
-@@ -81,87 +73,79 @@ Amarok::TrayIcon::TrayIcon( QObject *parent )
-
- setIconByName( "amarok" );
-
-- setupToolTip();
-+ setupToolTip( true );
-
- connect( this, SIGNAL( scrollRequested( int, Qt::Orientation ) ), SLOT( slotScrollRequested(int, Qt::Orientation) ) );
- connect( this, SIGNAL( secondaryActivateRequested( const QPoint & ) ), SLOT( slotActivated() ) );
- }
-
- void
--Amarok::TrayIcon::setupToolTip()
-+Amarok::TrayIcon::setupToolTip( bool updateIcon )
- {
- if( m_track )
- {
- setToolTipTitle( The::engineController()->prettyNowPlaying() );
-
-- QStringList tooltip;
-- if( m_track->album() && m_track->album()->hasImage() )
-+ // check if we really need to update the icon (performance tweak)
-+ if( updateIcon )
- {
-- const QString uid = m_track->uidUrl();
-- if ( uid != m_toolTipIconUid ) {
-- const QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
-+ if( m_track->album() && m_track->album()->hasImage() )
-+ {
-+ debug() << "HERE";
-+ QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
- setToolTipIconByPixmap( image );
-- m_toolTipIconUid = uid;
- }
-- }
-- else
-- {
-- setToolTipIconByName( "amarok" );
-- m_toolTipIconUid.clear();
-+ else
-+ {
-+ setToolTipIconByName( "amarok" );
-+ }
- }
-
-- QStringList left, right;
-+ QStringList tooltip;
-
-- // TODO: Replace block by some other useful information
- QString volume;
- if ( The::engineController()->isMuted() )
-+ {
- volume = i18n( "Muted" );
-+ }
- else
-+ {
- volume = QString( "%1%" ).arg( The::engineController()->volume() );
-- right << QString("<i>%1</i>").arg( volume );
-- left << QString( "<i>%1</i>" ).arg( i18n( "Volume" ) );
-+ }
-+ tooltip << QString("<i>%1: %2</i>").arg( i18n( "Volume" ) ).arg( volume );
-
- const float score = m_track->score();
- if( score > 0.f )
- {
-- right << QString::number( score, 'f', 2 ); // 2 digits after decimal point
-- left << i18n( "Score" );
-+ tooltip << QString( "%1: %2" ).arg( i18n( "Score" ) ).arg( QString::number( score, 'f', 2 ) );
- }
-
- const int rating = m_track->rating();
- if( rating > 0 )
- {
-- QString s;
-+ QString stars;
- for( int i = 0; i < rating / 2; ++i )
-- s += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-+ stars += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
- .arg( KStandardDirs::locate( "data", "amarok/images/star.png" ) )
- .arg( QFontMetrics( QToolTip::font() ).height() )
- .arg( QFontMetrics( QToolTip::font() ).height() );
- if( rating % 2 )
-- s += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-+ stars += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
- .arg( KStandardDirs::locate( "data", "amarok/images/smallstar.png" ) )
- .arg( QFontMetrics( QToolTip::font() ).height() )
- .arg( QFontMetrics( QToolTip::font() ).height() );
-- right << s;
-- left << i18n( "Rating" );
-+
-+ tooltip << QString( "%1: %2" ).arg( i18n( "Rating" ) ).arg( stars );
- }
-
- const int count = m_track->playCount();
- if( count > 0 )
- {
-- right << QString::number( count );
-- left << i18n( "Play Count" );
-+ tooltip << QString( "%1: %2" ).arg( i18n( "Play Count" ) ).arg( QString::number( count ) );
- }
-
- const uint lastPlayed = m_track->lastPlayed();
-- right << Amarok::verboseTimeSince( lastPlayed );
-- left << i18n( "Last Played" );
--
-- // NOTE: It seems to be necessary to <center> each element indivdually
-- const QString row = "- %1: %2";
-- for( int x = 0; x < left.count(); ++x )
-- if ( !right[x].isEmpty() )
-- tooltip << row.arg( left[x] ).arg( right[x] );
-+ tooltip << QString( "%1: %2" ).arg( i18n( "Last played" ) ).arg( Amarok::verboseTimeSince( lastPlayed ) );
-
- setToolTipSubTitle( tooltip.join("<br>") );
- }
-@@ -170,8 +154,6 @@ Amarok::TrayIcon::setupToolTip()
- setToolTipIconByName( "amarok" );
- setToolTipTitle( KCmdLineArgs::aboutData()->programName() );
- setToolTipSubTitle( The::engineController()->prettyNowPlaying() );
--
-- m_toolTipIconUid.clear();
- }
- }
-
-@@ -225,7 +207,7 @@ Amarok::TrayIcon::engineStateChanged( Phonon::State state, Phonon::State /*oldSt
- break;
- }
-
-- setupToolTip();
-+ setupToolTip( true );
- }
-
- void
-@@ -233,7 +215,7 @@ Amarok::TrayIcon::engineNewTrackPlaying()
- {
- m_track = The::engineController()->currentTrack();
-
-- setupToolTip();
-+ setupToolTip( true );
- setupMenu();
- }
-
-@@ -242,7 +224,7 @@ Amarok::TrayIcon::metadataChanged( Meta::TrackPtr track )
- {
- Q_UNUSED( track )
-
-- setupToolTip();
-+ setupToolTip( false );
- setupMenu();
- }
-
-@@ -251,7 +233,7 @@ Amarok::TrayIcon::metadataChanged( Meta::AlbumPtr album )
- {
- Q_UNUSED( album )
-
-- setupToolTip();
-+ setupToolTip( true );
- setupMenu();
- }
-
-@@ -260,7 +242,7 @@ Amarok::TrayIcon::engineVolumeChanged( int percent )
- {
- Q_UNUSED( percent );
-
-- setupToolTip();
-+ setupToolTip( false );
- }
-
- void
-@@ -268,7 +250,7 @@ Amarok::TrayIcon::engineMuteStateChanged( bool mute )
- {
- Q_UNUSED( mute );
-
-- setupToolTip();
-+ setupToolTip( false );
- }
-
- void
-diff --git a/src/TrayIcon.h b/src/TrayIcon.h
-index d590b5f..8640049 100644
---- a/src/TrayIcon.h
-+++ b/src/TrayIcon.h
-@@ -28,9 +28,6 @@
- #include <QAction>
- #include <QPointer>
-
--class QEvent;
--class App;
--
-
- namespace Amarok {
-
-@@ -41,8 +38,6 @@ class TrayIcon : public KStatusNotifierItem, public Engine::EngineObserver, publ
- public:
- TrayIcon( QObject *parent );
-
-- friend class ::App;
--
- void setVisible( bool visible );
-
- protected:
-@@ -63,10 +58,9 @@ private slots:
-
- private:
- void setupMenu();
-- void setupToolTip();
-+ void setupToolTip( bool updateIcon );
-
- Meta::TrackPtr m_track;
-- QString m_toolTipIconUid;
-
- SmartPointerList<QAction> m_extraActions;
- QPointer<QAction> m_separator;
---
-1.7.0.4
-
diff --git a/0004-Minor-Remove-redundant-debug-output.-Update-copyrigh.patch b/0004-Minor-Remove-redundant-debug-output.-Update-copyrigh.patch
deleted file mode 100644
index 1478cdb..0000000
--- a/0004-Minor-Remove-redundant-debug-output.-Update-copyrigh.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f4a84c64c3c1e602dd958e56b90114f3c1763fe1 Mon Sep 17 00:00:00 2001
-From: Kevin Funk <krf@electrostorm.net>
-Date: Thu, 8 Jul 2010 18:26:55 +0200
-Subject: [PATCH 4/4] Minor: Remove redundant debug output. Update copyright info
-
----
- src/TrayIcon.cpp | 1 -
- src/TrayIcon.h | 6 +++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
-index 7398e2a..6b99d33 100644
---- a/src/TrayIcon.cpp
-+++ b/src/TrayIcon.cpp
-@@ -91,7 +91,6 @@ Amarok::TrayIcon::setupToolTip( bool updateIcon )
- {
- if( m_track->album() && m_track->album()->hasImage() )
- {
-- debug() << "HERE";
- QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
- setToolTipIconByPixmap( image );
- }
-diff --git a/src/TrayIcon.h b/src/TrayIcon.h
-index 8640049..2cb3eca 100644
---- a/src/TrayIcon.h
-+++ b/src/TrayIcon.h
-@@ -1,7 +1,7 @@
- /****************************************************************************************
- * Copyright (c) 2003 Stanislav Karchebny <berkus@users.sf.net> *
-- * Copyright (c) 2009 Kevin Funk <krf@electrostorm.net> *
- * Copyright (c) 2009 Mark Kretschmann <kretschmann@kde.org> *
-+ * Copyright (c) 2009,2010 Kevin Funk <krf@electrostorm.net> *
- * *
- * This program is free software; you can redistribute it and/or modify it under *
- * the terms of the GNU General Public License as published by the Free Software *
-@@ -19,11 +19,11 @@
- #ifndef AMAROK_TRAYICON_H
- #define AMAROK_TRAYICON_H
-
--#include "core/engine/EngineObserver.h" //baseclass
-+#include "core/engine/EngineObserver.h" // baseclass
- #include "core/meta/Meta.h"
- #include "core/support/SmartPointerList.h"
-
--#include <KStatusNotifierItem> //baseclass
-+#include <KStatusNotifierItem> // baseclass
-
- #include <QAction>
- #include <QPointer>
---
-1.7.0.4
-
diff --git a/amarok-2.3.1-glib26_signals_fix.patch b/amarok-2.3.1-glib26_signals_fix.patch
deleted file mode 100644
index 308978e..0000000
--- a/amarok-2.3.1-glib26_signals_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp.signals_fix amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
---- amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp.signals_fix 2010-05-27 13:37:21.000000000 -0500
-+++ amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp 2010-06-10 13:57:50.291880276 -0500
-@@ -28,6 +28,10 @@
- extern "C" {
- #include <glib-object.h> // g_type_init
- #ifdef GDK_FOUND
-+// work around compile issue with glib >= 2.25
-+#ifdef signals
-+ #undef signals
-+#endif
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #endif
- }
diff --git a/amarok.spec b/amarok.spec
index c2a1286..62a83d0 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,23 +1,18 @@
Name: amarok
Summary: Media player
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.3.1.90
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
Url: http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch50: amarok-2.2.1.90-qtscript_not_required.patch
## upstream patches
-Patch100: amarok-2.3.1-glib26_signals_fix.patch
-Patch101: 0001-Move-some-code-in-TrayIcon-class.patch
-Patch102: 0002-Some-TrayIcon-changes.patch
-patch103: 0003-TrayIcon-Do-not-update-cover-each-time-we-update-the.patch
-Patch104: 0004-Minor-Remove-redundant-debug-output.-Update-copyrigh.patch
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
@@ -86,13 +81,6 @@ Obsoletes: amarok-utilities < 2.0.96
%setup -q
%patch50 -p1 -b .qtscript_not_required
-%if 0%{?fedora} > 13
-%patch100 -p1 -b .glib26_signals_fix
-%endif
-%patch101 -p1 -b .0001
-%patch102 -p1 -b .0002
-%patch103 -p1 -b .0003
-%patch104 -p1 -b .0004
%build
@@ -109,7 +97,11 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang amarok
+# an initial handbook is available, but it is currently fubar
+# FIXME
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/amarok
+
+%find_lang amarok --with-kde
%find_lang amarokcollectionscanner_qt
%find_lang amarokpkg
%find_lang amarok_scriptengine_qscript
@@ -122,6 +114,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plas
%check
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
%clean
@@ -162,6 +155,7 @@ fi
%{_kde4_configdir}/amarok_homerc
%{_kde4_configdir}/amarokapplets.knsrc
%{_kde4_datadir}/applications/kde4/amarok.desktop
+%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
%{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/services/*.protocol
@@ -186,6 +180,9 @@ fi
%changelog
+* Mon Aug 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.1.90-1
+- amarok-2.3.1.90 (2.3.2 beta1)
+
* Fri Jul 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.1-2
- No Notification Area icon for non-KDE desktops (kde#232578,rh#603336)
diff --git a/sources b/sources
index 696aedc..337a849 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6679adaf5cc757b1515a9f03cdcb6066 amarok-2.3.1.tar.bz2
+2b88de0f17b8edabfa4afcae4b1420c8 amarok-2.3.1.90.tar.bz2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-06 18:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-06 18:04 [rpms/amarok] epel10: - amarok-2.3.1.90 (2.3.2 beta1) Rex Dieter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox