commit amarok for openSUSE:Factory
Hello community,
here is the log from the commit of package amarok for openSUSE:Factory checked in at 2012-01-30 12:23:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
and /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2011-12-21 09:59:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2012-01-30 12:23:43.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 27 10:08:00 UTC 2012 - idonmez@suse.com
+
+- Add patch to fix kde#290123
+
+-------------------------------------------------------------------
New:
----
kde-290123.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.PzYzx8/_old 2012-01-30 12:23:45.000000000 +0100
+++ /var/tmp/diff_new_pack.PzYzx8/_new 2012-01-30 12:23:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package amarok
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,8 @@
Patch2: initial-preference.diff
# PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files
Patch3: flac_mimetype_bnc671581.diff
+# PATCH-FIX-UPSTREAM kde#290123 idoenmez@suse.de -- Fix for kde bug 290123
+Patch4: kde-290123.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Required for the fdupes macro
@@ -94,6 +96,7 @@
%if 0%{?suse_version} > 1130
%patch3
%endif
+%patch4 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
++++++ kde-290123.patch ++++++
diff -ur amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.cpp
--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.cpp 2012-01-27 11:06:27.089992129 +0100
@@ -67,6 +67,19 @@
}
void
+
+Context::AppletToolbar::setContainment( Containment * containment )
+{
+ m_cont = containment;
+}
+
+Context::Containment *
+Context::AppletToolbar::containment() const
+{
+ return m_cont;
+}
+
+void
Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
{
debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
diff -ur amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.h
--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.h 2012-01-27 11:05:58.149992133 +0100
@@ -55,6 +55,9 @@
void appletRemoved( Plasma::Applet* applet );
+ void setContainment( Containment * containment );
+ Containment* containment() const;
+
signals:
void showApplet( Plasma::Applet* );
void appletAddedToToolbar( Plasma::Applet* applet, int loc );
diff -ur amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.fixed/src/context/ToolbarView.cpp
--- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/ToolbarView.cpp 2012-01-27 11:05:58.149992133 +0100
@@ -74,7 +74,9 @@
setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
// now we create the toolbar
- m_toolbar = new AppletToolbar( containment );
+ m_toolbar = new AppletToolbar(0);
+ scene->addItem(m_toolbar.data());
+ m_toolbar.data()->setContainment( qobject_cast
participants (1)
-
root@hilbert.suse.de