Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=18c78da7d97fa0619182936fed7e9b7a4db6d759
commit 18c78da7d97fa0619182936fed7e9b7a4db6d759 Author: Melko <[email protected]> Date: Sun Aug 12 23:59:36 2012 +0200 amarok-2.6.0-1-i686 * forgot to remove useless patches diff --git a/source/kde-extra/amarok/0001-contextview-taskbar-not-child-of-containment.patch b/source/kde-extra/amarok/0001-contextview-taskbar-not-child-of-containment.patch deleted file mode 100644 index d53b2ed..0000000 --- a/source/kde-extra/amarok/0001-contextview-taskbar-not-child-of-containment.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 1b2e221a9854d0ae377b04478fe8000c138c3511 Mon Sep 17 00:00:00 2001 -From: Marco Martin <[email protected]> -Date: Thu, 5 Jan 2012 16:59:05 +0100 -Subject: [PATCH 1/2] contextview taskbar not child of containment - -the containment being parent can control its appearance, such as clipping -BUG:290123 ---- - src/context/ToolbarView.cpp | 6 +++- - src/context/toolbar/AppletToolbar.cpp | 34 +++++++++++++++++++++++++++++++++ - src/context/toolbar/AppletToolbar.h | 3 ++ - 3 files changed, 41 insertions(+), 2 deletions(-) - -diff --git a/src/context/ToolbarView.cpp b/src/context/ToolbarView.cpp -index f3b4916..840b99b 100644 ---- a/src/context/ToolbarView.cpp -+++ b/src/context/ToolbarView.cpp -@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc - 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<Context::Containment *>(containment) ); - m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); - m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); - -@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc - - Context::ToolbarView::~ToolbarView() - { -- -+ delete m_toolbar.data(); - } - - void -diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp -index 0e0deb5..c5d749b 100644 ---- a/src/context/toolbar/AppletToolbar.cpp -+++ b/src/context/toolbar/AppletToolbar.cpp -@@ -67,6 +67,40 @@ Context::AppletToolbar::~AppletToolbar() - } - - void -+<<<<<<< Updated upstream -+======= -+Context::AppletToolbar::setContainment( Containment * containment ) -+{ -+ m_cont = containment; -+} -+ -+Context::Containment * -+Context::AppletToolbar::containment() const -+{ -+ return m_cont; -+} -+ -+void -+Context::AppletToolbar::paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget ) -+{ -+ Q_UNUSED( option ) -+ Q_UNUSED( widget ) -+ -+ painter->setRenderHint( QPainter::Antialiasing ); -+ painter->save(); -+ -+ QColor col = PaletteHandler::alternateBackgroundColor(); -+ qreal radius = 3; -+ -+ QPainterPath outline; -+ outline.addRoundedRect( boundingRect(), radius, radius ); -+ painter->fillPath( outline, QBrush( col ) ); -+ -+ painter->restore(); -+} -+ -+void -+>>>>>>> Stashed changes - Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event ) - { - debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() ); -diff --git a/src/context/toolbar/AppletToolbar.h b/src/context/toolbar/AppletToolbar.h -index ee8a208..058baae 100644 ---- a/src/context/toolbar/AppletToolbar.h -+++ b/src/context/toolbar/AppletToolbar.h -@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWidget - - void appletRemoved( Plasma::Applet* applet ); - -+ void setContainment( Containment * containment ); -+ Containment* containment() const; -+ - signals: - void showApplet( Plasma::Applet* ); - void appletAddedToToolbar( Plasma::Applet* applet, int loc ); --- -1.7.6 - diff --git a/source/kde-extra/amarok/0002-solve-the-conflict.patch b/source/kde-extra/amarok/0002-solve-the-conflict.patch deleted file mode 100644 index 28ab03a..0000000 --- a/source/kde-extra/amarok/0002-solve-the-conflict.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b3d81df5d7131676fdc7bebbb5aae10b200221fa Mon Sep 17 00:00:00 2001 -From: Marco Martin <[email protected]> -Date: Thu, 5 Jan 2012 17:06:16 +0100 -Subject: [PATCH 2/2] solve the conflict - -sorry about that -CCBUG:290123 ---- - src/context/toolbar/AppletToolbar.cpp | 23 +---------------------- - 1 files changed, 1 insertions(+), 22 deletions(-) - -diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp -index c5d749b..c51762c 100644 ---- a/src/context/toolbar/AppletToolbar.cpp -+++ b/src/context/toolbar/AppletToolbar.cpp -@@ -67,8 +67,7 @@ Context::AppletToolbar::~AppletToolbar() - } - - void --<<<<<<< Updated upstream --======= -+ - Context::AppletToolbar::setContainment( Containment * containment ) - { - m_cont = containment; -@@ -81,26 +80,6 @@ Context::AppletToolbar::containment() const - } - - void --Context::AppletToolbar::paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget ) --{ -- Q_UNUSED( option ) -- Q_UNUSED( widget ) -- -- painter->setRenderHint( QPainter::Antialiasing ); -- painter->save(); -- -- QColor col = PaletteHandler::alternateBackgroundColor(); -- qreal radius = 3; -- -- QPainterPath outline; -- outline.addRoundedRect( boundingRect(), radius, radius ); -- painter->fillPath( outline, QBrush( col ) ); -- -- painter->restore(); --} -- --void -->>>>>>> Stashed changes - Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event ) - { - debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() ); --- -1.7.6 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
