amarok, port nettoyé

4 files changed, 3 insertions, 99 deletions

diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index 1c1d1765f..4a3b27816 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -8,9 +8,8 @@
 name=amarok
 version=2.3.2
 release=2
-source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2
-	splash_screen.jpg
-	scanning-qt-regression.patch)
+source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2 \
+	http://nutyx.meticul.eu/files/patchs/$name/{splash_screen.jpg,scanning-qt-regression.patch}
 
 build() {
 	cd $name-$version
@@ -26,5 +25,5 @@ build() {
 		  -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 	make
 	make DESTDIR=$PKG install
-	cp $SRC/splash_screen.jpg $PKG//usr/share/apps/amarok/images/splash_screen.jpg
+	install -m644 $SRC/splash_screen.jpg $PKG//usr/share/apps/amarok/images/splash_screen.jpg
 }
diff --git a/kde/amarok/ipodcollection.patch b/kde/amarok/ipodcollection.patch
deleted file mode 100644
index 3782de803..000000000
--- a/kde/amarok/ipodcollection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: index 2507cb7..dbeb161 100644
-===================================================================
---- src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-+++ src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-@@ -28,6 +28,10 @@
- extern "C" {
- #include <glib-object.h> // g_type_init
- #ifdef GDK_FOUND
-+// work around compile issue with glib >= 2.25
-+#ifdef signals
-+ #undef signals
-+#endif
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #endif
- }
diff --git a/kde/amarok/scanning-qt-regression.patch b/kde/amarok/scanning-qt-regression.patch
deleted file mode 100644
index 27c6bb067..000000000
--- a/kde/amarok/scanning-qt-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Jeff Mitchell <mitchell@kde.org>
-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() < 20 &&
-+                    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
diff --git a/kde/amarok/splash_screen.jpg b/kde/amarok/splash_screen.jpg
deleted file mode 100644
index abacee3f5..000000000
--- a/kde/amarok/splash_screen.jpg
+++ /dev/null