[rpms/amarok] epel10: - appletsize patch

[rpms/amarok] epel10: - appletsize patch

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10
            Commit : b92a64829688b0ad1a6a199d1a45ac33685a9a48
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2010-11-04T10:28:28-05:00
            Stats  : +189/-5 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/b92a64829688b0ad1a6a199d1a45ac33685a9a48?branch=epel10

            Log:
            - appletsize patch
- fix/improve ipod3 support patch
- another collectionscanner patch

---
diff --git a/amarok-2.3.2-appletsize.patch b/amarok-2.3.2-appletsize.patch
new file mode 100644
index 0000000..799dccc
--- /dev/null
+++ b/amarok-2.3.2-appletsize.patch
@@ -0,0 +1,97 @@
+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
new file mode 100644
index 0000000..ac71367
--- /dev/null
+++ b/amarok-2.3.2-collectionscanner_decimalhex.patch
@@ -0,0 +1,25 @@
+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-ipod3.patch b/amarok-2.3.2-ipod3.patch
new file mode 100644
index 0000000..742c392
--- /dev/null
+++ b/amarok-2.3.2-ipod3.patch
@@ -0,0 +1,49 @@
+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.spec b/amarok.spec
index 686c632..0c64690 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,7 +6,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -17,8 +17,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch10: amarok-2.3.2_bpm_tags-in-flac_fix.patch
-Patch20: amarok-2.3.2_0001-Re-add-some-tests-for-unprintable-but-also-invalid-c.patch
+Patch100: amarok-2.3.2_bpm_tags-in-flac_fix.patch
+Patch101: amarok-2.3.2_0001-Re-add-some-tests-for-unprintable-but-also-invalid-c.patch
+Patch102: amarok-2.3.2-collectionscanner_decimalhex.patch
+Patch103: amarok-2.3.2-appletsize.patch
+# http://git.reviewboard.kde.org/r/100132/
+Patch104: amarok-2.3.2-ipod3.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -87,9 +91,13 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %prep
 %setup -q 
-%patch10 -p0
-%patch20 -p1
+
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p0 -b .bpm_tags-in-flac_fix
+%patch101 -p1 -b .tests-for-unprintable-but-also-invalid
+%patch102 -p1 -b .collectionscanner_decimalhex
+%patch103 -p1 -b .appletsize
+%patch104 -p1 -b .ipod3
 
 %build
 mkdir -p %{_target_platform}
@@ -184,6 +192,11 @@ fi
 
 
 %changelog
+* Thu Nov 04 2010 Rex Dieter <rdieter@fedoraproject.org> 2.3.2-5
+- appletsize patch
+- fix/improve ipod3 support patch
+- another collectionscanner patch
+
 * Wed Sep 29 2010 jkeating - 2.3.2-4
 - Rebuilt for gcc bug 634757