summaryrefslogtreecommitdiffstats
path: root/kde/patch/amarok/amarok_kdebug_320855.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--kde/patch/amarok/amarok_kdebug_320855.patch37
-rw-r--r--kde/patch/amarok/amarok_kdebug_320855.patch.gzbin797 -> 0 bytes
2 files changed, 37 insertions, 0 deletions
diff --git a/kde/patch/amarok/amarok_kdebug_320855.patch b/kde/patch/amarok/amarok_kdebug_320855.patch
new file mode 100644
index 0000000..ce36100
--- /dev/null
+++ b/kde/patch/amarok/amarok_kdebug_320855.patch
@@ -0,0 +1,37 @@
+From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date: Mon, 10 Jun 2013 07:26:37 +0000
+Subject: Remove usage of (fake) Amarok-Mockup theme
+X-Git-Tag: v2.7.90
+X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=e899704b3db4af2ff228eb0d4dbbec05fb9a2448
+---
+Remove usage of (fake) Amarok-Mockup theme
+
+This is due to https://bugs.kde.org/show_bug.cgi?id=320855
+Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11
+If it is still needed, or there is a better solution, i'll discard the review...
+
+From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001
+From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date: Sun, 9 Jun 2013 19:55:58 +0200
+Subject: [PATCH 1/1] Kill Amarok-Mockup
+
+BUG: 320855
+FIXED-IN: 2.8
+REVIEW: 110917
+---
+
+
+--- a/src/context/ContextView.cpp
++++ b/src/context/ContextView.cpp
+@@ -78,11 +78,6 @@
+ p.setColor( QPalette::Base, c );
+ setPalette( p );
+
+- PERF_LOG( "Accessing Plasma::Theme" );
+- // here we initialize all the Plasma paths to Amarok paths
+- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false );
+- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" );
+- PERF_LOG( "Access to Plasma::Theme complete" )
+ contextScene()->setAppletMimeType( "text/x-amarokappletservicename" );
+
+ cont->setPos( 0, 0 );
diff --git a/kde/patch/amarok/amarok_kdebug_320855.patch.gz b/kde/patch/amarok/amarok_kdebug_320855.patch.gz
deleted file mode 100644
index ba0d690..0000000
--- a/kde/patch/amarok/amarok_kdebug_320855.patch.gz
+++ /dev/null
Binary files differ