[rpms/amarok] epel10: drop old patches

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : dec971b0ccb4ae7f0825841fc7068e9788d627b3
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-12-07T15:28:05-06:00
Stats  : +0/-292 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/dec971b0ccb4ae7f0825841fc7068e9788d627b3?branch=epel10

Log:
drop old patches

---
diff --git a/amarok-2.3.2-appletsize.patch b/amarok-2.3.2-appletsize.patch
deleted file mode 100644
index 799dccc..0000000
--- a/amarok-2.3.2-appletsize.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-commit 7dbec1171386f182be77942ae43dc3684a96cfc4
-Author: Mark Kretschmann <kretschmann@kde.org>
-Date:   Sat Oct 2 09:06:11 2010 +0200
-
-    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 <debfx-pkg@fobos.de> for the idea.
-    
-    It might worth to include this patch in Amarok packages.
-    
-    CCMAIL: debfx-pkg@fobos.de
-    CCMAIL: amarok-packagers@googlegroups.com
-
-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
-

diff --git a/amarok-2.3.2-collectionscanner_decimalhex.patch b/amarok-2.3.2-collectionscanner_decimalhex.patch
deleted file mode 100644
index ac71367..0000000
--- a/amarok-2.3.2-collectionscanner_decimalhex.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 182f39c15575c3c1ce2b0425f9e3ec5997f3a9fd Mon Sep 17 00:00:00 2001
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Fri, 15 Oct 2010 11:07:24 -0400
-Subject: [PATCH] Fix decimal->hex mistake
-
----
- utilities/collectionscanner/CollectionScanner.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index 28c554b..b216714 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -834,7 +834,7 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
-             if( data[i].category() == QChar::NoCategory ||
-                 data[i].category() == QChar::Other_Surrogate ||
-                 ( 
--                    data[i].unicode() < 20 &&
-+                    data[i].unicode() < 32 &&
-                     data[i].unicode() != 9 &&
-                     data[i].unicode() != 10 &&
-                     data[i].unicode() != 13
--- 
-1.7.3.2
-

diff --git a/amarok-2.3.2-flac_mimetype.patch b/amarok-2.3.2-flac_mimetype.patch
deleted file mode 100644
index bff7b7d..0000000
--- a/amarok-2.3.2-flac_mimetype.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Newer shared-mime-info (ie, on fedora 14) treats audio/flac as primary mimetype
-(esp when using phonon-backend-gstreamer)
-
-diff -up amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp.flac_mime amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp
---- amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp.flac_mime	2010-09-15 16:24:11.000000000 -0500
-+++ amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp	2010-11-30 06:48:09.325424753 -0600
-@@ -87,7 +87,7 @@ TagLib::File *MimeFileTypeResolver::crea
-     {
-         return new TagLib::RIFF::AIFF::File(fileName, readProperties, propertiesStyle);
-     }
--    else if( mimetype->is( "audio/x-flac" ) )
-+    else if( mimetype->is( "audio/x-flac" ) || mimetype->is( "audio/flac" ) )
-     {
-         return new TagLib::FLAC::File(fileName, readProperties, propertiesStyle);
-     }
-diff -up amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp.flac_mime amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp
---- amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp.flac_mime	2010-09-15 16:24:11.000000000 -0500
-+++ amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp	2010-11-30 06:48:31.899424125 -0600
-@@ -188,7 +188,7 @@ UmsHandler::init()
-             << "mp4" << "mp2" << "ac3";
- 
- */
--    m_mimetypes << "audio/mpeg" << "audio/x-wav" << "video/x-ms-asf" << "audio/x-flac"
-+    m_mimetypes << "audio/mpeg" << "audio/x-wav" << "video/x-ms-asf" << "audio/x-flac" << "audio/flac"
-             << "audio/x-ms-wma" << "application/ogg" << "audio/mp4" << "audio/mp4a-latm"
-             << "video/mp4" << "audio/ac3";
- 

diff --git a/amarok-2.3.2-ipod3.patch b/amarok-2.3.2-ipod3.patch
deleted file mode 100644
index 742c392..0000000
--- a/amarok-2.3.2-ipod3.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/MediaDeviceCache.cpp b/src/MediaDeviceCache.cpp
---- a/src/MediaDeviceCache.cpp
-+++ b/src/MediaDeviceCache.cpp
-@@ -215,18 +215,21 @@ MediaDeviceCache::slotAddSolidDevice( const QString &udi )
-     else if( const Solid::GenericInterface *generic = device.as<Solid::GenericInterface>() )
-     {
-         const QMap<QString, QVariant> properties = generic->allProperties();
--        if( !properties.contains("info.capabilities") )
--        {
--            debug() << "udi " << udi << " does not describe a portable media player or storage volume";
--            return;
--        }
--
--        const QStringList capabilities = properties["info.capabilities"].toStringList();
--        if( !capabilities.contains("afc") )
--        {
--            debug() << "udi " << udi << " does not describe a portable media player or storage volume";
--            return;
--        }
-+	if ( !device.product().contains("iPod") )
-+	{
-+            if( !properties.contains("info.capabilities") )
-+            {
-+                debug() << "udi " << udi << " does not describe a portable media player or storage volume";
-+                return;
-+            }
-+    
-+            const QStringList capabilities = properties["info.capabilities"].toStringList();
-+            if( !capabilities.contains("afc") )
-+            {
-+                debug() << "udi " << udi << " does not describe a portable media player or storage volume";
-+                return;
-+            }
-+	}
- 
-         debug() << "udi" << udi << "is AFC cabable (Apple mobile device)";
-         m_type[udi] = MediaDeviceCache::SolidGenericType;
-diff --git a/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp b/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
---- a/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-+++ b/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-@@ -168,7 +168,7 @@ void
- IpodHandler::init()
- {
-     bool isMounted = m_deviceInfo->wasMounted();
--    if( !isMounted && !m_deviceInfo->deviceUid().isEmpty() )
-+    if( !isMounted )
-     {
-         QStringList args;
-         if( !m_deviceInfo->deviceUid().isEmpty() )

diff --git a/amarok-2.3.2_0001-Re-add-some-tests-for-unprintable-but-also-invalid-c.patch b/amarok-2.3.2_0001-Re-add-some-tests-for-unprintable-but-also-invalid-c.patch
deleted file mode 100644
index 4e8faec..0000000
--- a/amarok-2.3.2_0001-Re-add-some-tests-for-unprintable-but-also-invalid-c.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 79d86829294ac54132c01153660e70e30c15c378 Mon Sep 17 00:00:00 2001
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Wed, 22 Sep 2010 18:15:17 -0400
-Subject: [PATCH] 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
----
- utilities/collectionscanner/CollectionScanner.cpp |   27 +++++++++++++-------
- 1 files changed, 17 insertions(+), 10 deletions(-)
-
-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
--- 
-1.7.0.4
-

diff --git a/amarok-2.3.2_bpm_tags-in-flac_fix.patch b/amarok-2.3.2_bpm_tags-in-flac_fix.patch
deleted file mode 100644
index 4de5ede..0000000
--- a/amarok-2.3.2_bpm_tags-in-flac_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utilities/collectionscanner/CollectionScanner.cpp	2010-09-15 23:24:13.000000000 +0200
-+++ utilities/collectionscanner/CollectionScanner.cpp.old	2010-09-20 15:43:55.000000000 +0200
-@@ -701,7 +701,7 @@
-                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
--                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
-+                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();