public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/amarok] epel10: - amarok-2.3.0.90
@ 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 : be640eabb920002beaafed667773dce34cc8ff0e
Author : Rex Dieter <rdieter@fedoraproject.org>
Date : 2010-04-17T15:35:27+00:00
Stats : +8/-119 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/be640eabb920002beaafed667773dce34cc8ff0e?branch=epel10
Log:
- amarok-2.3.0.90
---
diff --git a/.cvsignore b/.cvsignore
index ba488fe..be43edd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.3.0.tar.bz2
+amarok-2.3.0.90.tar.bz2
diff --git a/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch b/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
deleted file mode 100644
index 4f7f695..0000000
--- a/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 50bf5a7e55b08426fd60f4928e65ac066349f83d Mon Sep 17 00:00:00 2001
-From: Bartosz Brachaczek <b.brachaczek@gmail.com>
-Date: Tue, 23 Mar 2010 22:53:13 +0100
-Subject: [PATCH] Fix logic error in EngineController::supportedMimeTypes causing mp3 support misdetection
-
-Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
----
- src/EngineController.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/EngineController.cpp b/src/EngineController.cpp
-index 79acb4f..87745ea 100644
---- a/src/EngineController.cpp
-+++ b/src/EngineController.cpp
-@@ -239,7 +239,7 @@ EngineController::supportedMimeTypes()
- mimeTable << "audio/x-m4b"; // MP4 Audio Books have a different extension that KFileItem/Phonon don't grok
-
- // We special case this, as otherwise the users would hate us
-- if( ( !mimeTable.contains( "audio/mp3" ) || !mimeTable.contains( "audio/x-mp3" ) ) && !installDistroCodec() )
-+ if( ( !mimeTable.contains( "audio/mp3" ) && !mimeTable.contains( "audio/x-mp3" ) ) && !installDistroCodec() )
- {
- The::statusBar()->longMessage(
- i18n( "<p>Phonon claims it <b>cannot</b> play MP3 files. You may want to examine "
---
-1.6.1
-
diff --git a/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch b/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
deleted file mode 100644
index 03e9257..0000000
--- a/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From a62fed8c667a076daa21fdf8360708813f1bf9e0 Mon Sep 17 00:00:00 2001
-From: Nikolaj Hald Nielsen <nhn@kde.org>
-Date: Mon, 22 Mar 2010 09:46:32 +0100
-Subject: [PATCH] Work around crash in the Info applet caused by a bug in certain versions of Qt.
-
-BUG: 229756
-BUG: 227639
----
- src/context/applets/info/InfoApplet.cpp | 19 +++++++++++++------
- src/context/applets/info/InfoApplet.h | 2 ++
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/context/applets/info/InfoApplet.cpp b/src/context/applets/info/InfoApplet.cpp
-index 166da4c..e415e98 100644
---- a/src/context/applets/info/InfoApplet.cpp
-+++ b/src/context/applets/info/InfoApplet.cpp
-@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<html>"
-
- InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
- : Context::Applet( parent, args )
-+ , m_webView( 0 )
- , m_initialized( false )
- , m_currentPlaylist( 0 )
-+
- {
- setHasConfigurationInterface( false );
- setBackgroundHints( Plasma::Applet::NoBackground );
-+}
-+
-+InfoApplet::~InfoApplet()
-+{
-+ delete m_webView;
-+}
-+
-+
-+void InfoApplet::init()
-+{
-
- dataEngine( "amarok-info" )->connectSource( "info", this );
-
- m_webView = new AmarokWebView( this );
-
- resize( 500, -1 );
--
-+
- QPalette p = m_webView->palette();
- p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0) );
- p.setColor( QPalette::Window, QColor( 255, 255, 255, 0) );
-@@ -62,11 +74,6 @@ InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
- constraintsEvent();
- }
-
--InfoApplet::~InfoApplet()
--{
-- delete m_webView;
--}
--
- void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
- {
- Q_UNUSED( constraints )
-diff --git a/src/context/applets/info/InfoApplet.h b/src/context/applets/info/InfoApplet.h
-index 4be28fc..775ea7c 100644
---- a/src/context/applets/info/InfoApplet.h
-+++ b/src/context/applets/info/InfoApplet.h
-@@ -48,6 +48,8 @@ public:
- InfoApplet( QObject* parent, const QVariantList& args );
- virtual ~InfoApplet();
-
-+ void init();
-+
- void paintInterface( QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect );
- void constraintsEvent( Plasma::Constraints constraints = Plasma::AllConstraints );
-
---
-1.6.1
-
diff --git a/amarok.spec b/amarok.spec
index e8815b0..3df459a 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,25 +1,18 @@
Name: amarok
Summary: Media player
-Version: 2.3.0
-Release: 5%{?dist}
+Version: 2.3.0.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
-# http://bugs.kde.org/227639
-# http://bugs.kde.org/229756
-Patch100: http://gitorious.org/amarok/amarok/commit/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
-# fix mp3-support detection logic
-Patch101: http://gitorious.org/amarok/amarok/commit/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
-# may need to rebase this, for building with qt-4.7
-# http://gitorious.org/amarok/amarok/commit/aa5ca5d179d084e99c8a477084ba717c35aa5030
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
@@ -28,10 +21,8 @@ BuildRequires: kdelibs4-devel
BuildRequires: libifp-devel
BuildRequires: liblastfm-devel
BuildRequires: libmp4v2-devel
-%if 0%{?fedora} > 9
BuildRequires: libmtp-devel >= 0.3.0
BuildRequires: libgpod-devel >= 0.7.0
-%endif
BuildRequires: libnjb-devel
BuildRequires: libusb-devel
BuildRequires: libxml2-devel
@@ -89,9 +80,6 @@ Obsoletes: amarok-utilities < 2.0.96
%patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .info_applet_workaround
-%patch101 -p1 -b .mp3_support_logic
-
%build
mkdir -p %{_target_platform}
@@ -183,6 +171,9 @@ fi
%changelog
+* Sat Apr 17 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0.90-1
+- amarok-2.3.0.90
+
* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0-5
- fix mp3 support logic
diff --git a/sources b/sources
index 153811c..a424bca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc672a2848e36b3b44eb81dd1466e4f4 amarok-2.3.0.tar.bz2
+a2eb7e81de59ab813ac2490f657d6dc4 amarok-2.3.0.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.0.90 Rex Dieter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox