[arch-commits] Commit in amarok/repos (10 files)

Ronald van Haren ronald at archlinux.org
Mon Jan 30 21:38:30 UTC 2012


    Date: Monday, January 30, 2012 @ 16:38:30
  Author: ronald
Revision: 148378

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  amarok/repos/extra-i686/PKGBUILD
    (from rev 148377, amarok/trunk/PKGBUILD)
  amarok/repos/extra-i686/amarok.install
    (from rev 148377, amarok/trunk/amarok.install)
  amarok/repos/extra-i686/toolbarfix.patch
    (from rev 148377, amarok/trunk/toolbarfix.patch)
  amarok/repos/extra-x86_64/PKGBUILD
    (from rev 148377, amarok/trunk/PKGBUILD)
  amarok/repos/extra-x86_64/amarok.install
    (from rev 148377, amarok/trunk/amarok.install)
  amarok/repos/extra-x86_64/toolbarfix.patch
    (from rev 148377, amarok/trunk/toolbarfix.patch)
Deleted:
  amarok/repos/extra-i686/PKGBUILD
  amarok/repos/extra-i686/amarok.install
  amarok/repos/extra-x86_64/PKGBUILD
  amarok/repos/extra-x86_64/amarok.install

-------------------------------+
 extra-i686/PKGBUILD           |   85 +++++++++++++++++++++-------------------
 extra-i686/amarok.install     |   24 +++++------
 extra-i686/toolbarfix.patch   |   61 ++++++++++++++++++++++++++++
 extra-x86_64/PKGBUILD         |   85 +++++++++++++++++++++-------------------
 extra-x86_64/amarok.install   |   24 +++++------
 extra-x86_64/toolbarfix.patch |   61 ++++++++++++++++++++++++++++
 6 files changed, 236 insertions(+), 104 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-30 21:37:44 UTC (rev 148377)
+++ extra-i686/PKGBUILD	2012-01-30 21:38:30 UTC (rev 148378)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=1
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: amarok/repos/extra-i686/PKGBUILD (from rev 148377, amarok/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=amarok
+replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
+pkgver=2.5.0
+pkgrel=2
+pkgdesc="The powerful music player for KDE"
+arch=("i686" "x86_64")
+url="http://amarok.kde.org"
+license=('GPL2' 'LGPL2.1' 'FDL')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             'libmygpo-qt')
+optdepends=("libgpod: support for Apple iPod audio devices"
+	        "libmtp: support for portable media devices"
+        	"loudmouth: backend needed by mp3tunes for syncing"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service")
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+	"toolbarfix.patch")
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
+          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
+
+build() {
+  cd "${srcdir}"
+
+  patch -Np0 -i "${srcdir}"/toolbarfix.patch
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package(){
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/amarok.install
===================================================================
--- extra-i686/amarok.install	2012-01-30 21:37:44 UTC (rev 148377)
+++ extra-i686/amarok.install	2012-01-30 21:38:30 UTC (rev 148378)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: amarok/repos/extra-i686/amarok.install (from rev 148377, amarok/trunk/amarok.install)
===================================================================
--- extra-i686/amarok.install	                        (rev 0)
+++ extra-i686/amarok.install	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Copied: amarok/repos/extra-i686/toolbarfix.patch (from rev 148377, amarok/trunk/toolbarfix.patch)
===================================================================
--- extra-i686/toolbarfix.patch	                        (rev 0)
+++ extra-i686/toolbarfix.patch	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,61 @@
+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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-01-30 21:37:44 UTC (rev 148377)
+++ extra-x86_64/PKGBUILD	2012-01-30 21:38:30 UTC (rev 148378)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=1
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: amarok/repos/extra-x86_64/PKGBUILD (from rev 148377, amarok/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=amarok
+replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
+pkgver=2.5.0
+pkgrel=2
+pkgdesc="The powerful music player for KDE"
+arch=("i686" "x86_64")
+url="http://amarok.kde.org"
+license=('GPL2' 'LGPL2.1' 'FDL')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             'libmygpo-qt')
+optdepends=("libgpod: support for Apple iPod audio devices"
+	        "libmtp: support for portable media devices"
+        	"loudmouth: backend needed by mp3tunes for syncing"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service")
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+	"toolbarfix.patch")
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
+          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
+
+build() {
+  cd "${srcdir}"
+
+  patch -Np0 -i "${srcdir}"/toolbarfix.patch
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package(){
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/amarok.install
===================================================================
--- extra-x86_64/amarok.install	2012-01-30 21:37:44 UTC (rev 148377)
+++ extra-x86_64/amarok.install	2012-01-30 21:38:30 UTC (rev 148378)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: amarok/repos/extra-x86_64/amarok.install (from rev 148377, amarok/trunk/amarok.install)
===================================================================
--- extra-x86_64/amarok.install	                        (rev 0)
+++ extra-x86_64/amarok.install	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Copied: amarok/repos/extra-x86_64/toolbarfix.patch (from rev 148377, amarok/trunk/toolbarfix.patch)
===================================================================
--- extra-x86_64/toolbarfix.patch	                        (rev 0)
+++ extra-x86_64/toolbarfix.patch	2012-01-30 21:38:30 UTC (rev 148378)
@@ -0,0 +1,61 @@
+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




More information about the arch-commits mailing list