Date: Saturday, January 15, 2011 @ 14:26:19 Author: andrea Revision: 106243
upgpkg: amarok 2.4.0-1 upstream release Modified: amarok/trunk/PKGBUILD Deleted: amarok/trunk/fix-applet-size-on-startup.patch amarok/trunk/scanning-qt-regression.patch ----------------------------------+ PKGBUILD | 29 +++------- fix-applet-size-on-startup.patch | 104 ------------------------------------- scanning-qt-regression.patch | 80 ---------------------------- 3 files changed, 10 insertions(+), 203 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-15 18:09:22 UTC (rev 106242) +++ PKGBUILD 2011-01-15 19:26:19 UTC (rev 106243) @@ -1,36 +1,27 @@ # $Id$ -# Contributor: Andrea Scarpino <[email protected]> +# Maintainer: Andrea Scarpino <[email protected]> # Contributor: damir <[email protected]> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.3.2 -pkgrel=3 +pkgver=2.4.0 +pkgrel=1 pkgdesc="A media player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org"; license=('GPL2' 'LGPL2' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 'liblastfm') -makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'docbook-xsl') +depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' + 'liblastfm' 'ffmpeg' 'libofa') +makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' + 'docbook-xsl') optdepends=("libgpod: support Apple iPod audio devices" "libmtp: support for portable media devices" "loudmouth: backend needed by mp3tunes for syncing") -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"; - 'scanning-qt-regression.patch' - 'fix-applet-size-on-startup.patch') -md5sums=('4e03dc009f8b44d9b8dfb5f6d1034081' - '4026759a6c753a5209e655cd4cc36bd8' - 'fdfe4947405fcfa58f273d34b41ddb32') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";) +md5sums=('bdb6ddc8e38d0982a0786ff8ac96d923') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Already fixed upstream - patch -Np1 -i ${srcdir}/fix-applet-size-on-startup.patch - # https://bugs.kde.org/show_bug.cgi?id=251762 - patch -Np1 -i ${srcdir}/scanning-qt-regression.patch - cd ${srcdir} mkdir build cd build Deleted: fix-applet-size-on-startup.patch =================================================================== --- fix-applet-size-on-startup.patch 2011-01-15 18:09:22 UTC (rev 106242) +++ fix-applet-size-on-startup.patch 2011-01-15 19:26:19 UTC (rev 106243) @@ -1,104 +0,0 @@ -From 7dbec1171386f182be77942ae43dc3684a96cfc4 Mon Sep 17 00:00:00 2001 -From: Mark Kretschmann <[email protected]> -Date: Sat, 2 Oct 2010 09:06:11 +0200 -Subject: [PATCH] Better workaround for wrong applet size on startup. - -This version also works in the case that Amarok was hidden to tray before -starting, and it does not produce a jerking motion when starting in fullscreen -mode. -Thanks to Felix Geyer <[email protected]> for the idea. - -It might worth to include this patch in Amarok packages. - -CCMAIL: [email protected] -CCMAIL: [email protected] ---- - src/App.cpp | 12 ------------ - src/App.h | 1 - - src/MainWindow.cpp | 17 +++++++++++++++++ - src/MainWindow.h | 1 + - 4 files changed, 18 insertions(+), 13 deletions(-) - -diff --git a/src/App.cpp b/src/App.cpp -index cd0efa3..507cf21 100644 ---- a/src/App.cpp -+++ b/src/App.cpp -@@ -790,18 +790,6 @@ App::continueInit() - aUrl.run(); - } - s_delayedAmarokUrls.clear(); -- -- QTimer::singleShot( 1500, this, SLOT( resizeMainWindow() ) ); --} -- -- --void App::resizeMainWindow() // SLOT --{ -- // HACK -- // This code works around a bug in KDE 4.5, which causes our Plasma applets to show -- // with a wrong initial size. Remove when this bug is fixed in Plasma. -- m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() - 1 ); -- m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() + 1 ); - } - - -diff --git a/src/App.h b/src/App.h -index 9c05eea..5866aa2 100644 ---- a/src/App.h -+++ b/src/App.h -@@ -83,7 +83,6 @@ class AMAROK_EXPORT App : public KUniqueApplication - - private slots: - void continueInit(); -- void resizeMainWindow(); - - public slots: - void applySettings( bool firstTime = false ); -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index 9a2c194..54c6751 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -506,6 +506,13 @@ MainWindow::showEvent(QShowEvent* e) - if (!m_layoutEverRestored) - restoreLayout(); - -+ static bool windowEverShown = false; -+ if ( !windowEverShown ) -+ { -+ windowEverShown = true; -+ QTimer::singleShot( 250, this, SLOT( resizeWindowHack() ) ); -+ } -+ - QWidget::showEvent(e); - } - -@@ -1704,4 +1711,14 @@ MainWindow::isWaitingForCd() const - return m_waitingForCd; - } - -+void -+MainWindow::resizeWindowHack() -+{ -+ // HACK -+ // This code works around a bug in KDE 4.5, which causes our Plasma applets to show -+ // with a wrong initial size. Remove when this bug is fixed in Plasma. -+ resize( width(), height() - 1 ); -+ resize( width(), height() + 1 ); -+} -+ - #include "MainWindow.moc" -diff --git a/src/MainWindow.h b/src/MainWindow.h -index e6ae0b3..b86470e 100644 ---- a/src/MainWindow.h -+++ b/src/MainWindow.h -@@ -148,6 +148,7 @@ class AMAROK_EXPORT MainWindow : public KMainWindow, public Engine::EngineObserv - void slotAddStream(); - void slotJumpTo(); - void showScriptSelector(); -+ void resizeWindowHack(); - #ifdef DEBUG_BUILD_TYPE - void showNetworkRequestViewer(); - #endif // DEBUG_BUILD_TYPE --- -1.7.3.2 - Deleted: scanning-qt-regression.patch =================================================================== --- scanning-qt-regression.patch 2011-01-15 18:09:22 UTC (rev 106242) +++ scanning-qt-regression.patch 2011-01-15 19:26:19 UTC (rev 106243) @@ -1,80 +0,0 @@ -From: Jeff Mitchell <[email protected]> -Date: Wed, 22 Sep 2010 22:15:17 +0000 (-0400) -Subject: Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes... -X-Git-Url: http://gitweb.kde.org?hp=fd2a40d970c57fa2102e95de1a60c59e37892638 - -Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes don't properly check for invalid chars when writing XML, even if you tell them to. - -Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class. - -BUG: 251762 ---- - -diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp -index 0a23a53..28c554b 100644 ---- a/utilities/collectionscanner/CollectionScanner.cpp -+++ b/utilities/collectionscanner/CollectionScanner.cpp -@@ -37,13 +37,13 @@ - #include <QByteArray> - #include <QDBusReply> - #include <QDir> --#include <QDomDocument> - #include <QFile> - #include <QtDebug> - #include <QTextCodec> - #include <QTextStream> - #include <QTimer> - #include <QThread> -+#include <QXmlStreamWriter> - - //Taglib: - #include <apetag.h> -@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS - void - CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes ) - { -- QDomDocument doc; // A dummy. We don't really use DOM, but SAX2 -- QDomElement element = doc.createElement( name ); -+ QString text; -+ QXmlStreamWriter writer( &text ); -+ -+ writer.writeStartElement( name ); - - QHashIterator<QString, QString> it( attributes ); - while( it.hasNext() ) -@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri - bool noCategory = false; - for( unsigned i = 0; i < len; i++ ) - { -- if( data[i].category() == QChar::NoCategory ) -+ if( data[i].category() == QChar::NoCategory || -+ data[i].category() == QChar::Other_Surrogate || -+ ( -+ data[i].unicode() < 32 && -+ data[i].unicode() != 9 && -+ data[i].unicode() != 10 && -+ data[i].unicode() != 13 -+ ) -+ ) - { - noCategory = true; - break; -@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri - - if( noCategory ) - continue; -- -- element.setAttribute( it.key(), it.value() ); -+ writer.writeAttribute( it.key(), it.value() ); - } - -- QString text; -- QTextStream stream( &text, QIODevice::WriteOnly ); -- element.save( stream, 0 ); -+ writer.writeEndElement(); - -- std::cout << text.toUtf8().data() << std::endl; -+ std::cout << text.toUtf8().data() << std::endl << std::endl; - } - - // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
