Commit 1ff172ae authored by Neophytos's avatar Neophytos

amarok needed a patch for toolbar fix

parent 8b3c16b9
......@@ -7,7 +7,7 @@
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
pkgver=2.5.0
pkgrel=3
pkgrel=4
pkgdesc="A media player for KDE"
arch=("i686" "x86_64")
url="http://amarok.kde.org"
......@@ -18,11 +18,17 @@ optdepends=("libgpod: support Apple iPod audio devices"
"libmtp: support for portable media devices"
"libmygpo-qt: support for gpodder.net" )
install="${pkgname}.install"
source=("http://mirrors.mit.edu/kde/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
md5sums=('b7983eaa33e4771769ae9e330c811995')
source=("http://mirrors.mit.edu/kde/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
"toolbarfix.patch")
md5sums=('b7983eaa33e4771769ae9e330c811995'
'135ceaaf24cf9e332eb4f714700da7ee')
build() {
cd "${srcdir}"
#Patch to add the toolbar not showing well, should be removed in newer versions.
patch -Np0 -i "${srcdir}"/toolbarfix.patch
mkdir build
cd build
cmake "../${pkgname}-${pkgver}" \
......
diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/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.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 20:20:01.901360205 +0100
@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
}
}
+void Context::AppletToolbar::setContainment( Containment * containment )
+{
+ m_cont = containment;
+}
+
+Context::Containment *
+Context::AppletToolbar::containment() const
+{
+ return m_cont;
+}
+
QSizeF
Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
{
Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/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.new/src/context/toolbar/AppletToolbar.h 2012-01-29 20:17:52.414686784 +0100
@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
void appletRemoved( Plasma::Applet* applet );
+ void setContainment( Containment * containment );
+ Containment* containment() const;
+
signals:
void showApplet( Plasma::Applet* );
void appletAddedToToolbar( Plasma::Applet* applet, int loc );
Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
--- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29 20:17:52.394686782 +0100
@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
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( Plasm
Context::ToolbarView::~ToolbarView()
{
-
+ delete m_toolbar.data();
}
void
Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment