public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/amarok] epel10: - workaround info applet crasher (kde#227639,kde#229756)
Date: Mon, 06 Jul 2026 18:04:29 GMT [thread overview]
Message-ID: <178336106989.1.6878829924469357038.rpms-amarok-cf7f0c86b1a7@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10
Commit : cf7f0c86b1a78101d80ee7e787c1875990302b9d
Author : Rex Dieter <rdieter@fedoraproject.org>
Date : 2010-03-22T12:58:58+00:00
Stats : +86/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/cf7f0c86b1a78101d80ee7e787c1875990302b9d?branch=epel10
Log:
- workaround info applet crasher (kde#227639,kde#229756)
---
diff --git a/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch b/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
new file mode 100644
index 0000000..03e9257
--- /dev/null
+++ b/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
@@ -0,0 +1,76 @@
+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 7cffd6f..e94375f 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
Name: amarok
Summary: Media player
Version: 2.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -13,6 +13,9 @@ 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
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
@@ -82,6 +85,9 @@ Obsoletes: amarok-utilities < 2.0.96
%patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .info_applet_workaround
+
+
%build
mkdir -p %{_target_platform}
@@ -173,6 +179,9 @@ fi
%changelog
+* Mon Mar 22 2010 Rex Dietr <rdieter@fedoraproject.org> - 2.3.0-3
+- workaround info applet crasher (kde#227639,kde#229756)
+
* Thu Mar 11 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0-2
- fix Source0 URL
- -libs: drop unused/extraneous kdelibs4 dep
reply other threads:[~2026-07-06 18:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178336106989.1.6878829924469357038.rpms-amarok-cf7f0c86b1a7@fedoraproject.org \
--to=rdieter@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox