summaryrefslogtreecommitdiff
path: root/audio/amarok/patches
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-10-02 10:08:31 +0000
committerwiz <wiz@pkgsrc.org>2010-10-02 10:08:31 +0000
commite3c759051d459dc9c64b3ac66a096212b348050a (patch)
tree22efc1e43743e21e1bbbf2bb68017fd8fd44616c /audio/amarok/patches
parent4c199cf108f039ee7aa507f4b2584b0c093144ec (diff)
downloadpkgsrc-e3c759051d459dc9c64b3ac66a096212b348050a.tar.gz
Commit following patch per upstream's suggestion:
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. Bump PKGREVISION.
Diffstat (limited to 'audio/amarok/patches')
-rw-r--r--audio/amarok/patches/patch-ac36
-rw-r--r--audio/amarok/patches/patch-ad25
-rw-r--r--audio/amarok/patches/patch-ae46
-rw-r--r--audio/amarok/patches/patch-af25
4 files changed, 132 insertions, 0 deletions
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
new file mode 100644
index 00000000000..8f62bbf74f8
--- /dev/null
+++ b/audio/amarok/patches/patch-ac
@@ -0,0 +1,36 @@
+$NetBSD: patch-ac,v 1.8 2010/10/02 10:08:31 wiz Exp $
+
+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.
+
+--- src/App.cpp.orig 2010-09-15 21:24:11.000000000 +0000
++++ src/App.cpp
+@@ -787,18 +787,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/audio/amarok/patches/patch-ad b/audio/amarok/patches/patch-ad
new file mode 100644
index 00000000000..e942d7f688b
--- /dev/null
+++ b/audio/amarok/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.3 2010/10/02 10:08:31 wiz Exp $
+
+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.
+
+--- src/App.h.orig 2010-09-15 21:24:11.000000000 +0000
++++ src/App.h
+@@ -83,7 +83,6 @@ class AMAROK_EXPORT App : public KUnique
+
+ private slots:
+ void continueInit();
+- void resizeMainWindow();
+
+ public slots:
+ void applySettings( bool firstTime = false );
diff --git a/audio/amarok/patches/patch-ae b/audio/amarok/patches/patch-ae
new file mode 100644
index 00000000000..5d958328ae2
--- /dev/null
+++ b/audio/amarok/patches/patch-ae
@@ -0,0 +1,46 @@
+$NetBSD: patch-ae,v 1.1 2010/10/02 10:08:31 wiz Exp $
+
+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.
+
+--- src/MainWindow.cpp.orig 2010-09-15 21:24:11.000000000 +0000
++++ 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/audio/amarok/patches/patch-af b/audio/amarok/patches/patch-af
new file mode 100644
index 00000000000..2f58ff7a957
--- /dev/null
+++ b/audio/amarok/patches/patch-af
@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.1 2010/10/02 10:08:31 wiz Exp $
+
+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.
+
+--- src/MainWindow.h.orig 2010-09-15 21:24:11.000000000 +0000
++++ src/MainWindow.h
+@@ -148,6 +148,7 @@ class AMAROK_EXPORT MainWindow : public
+ void slotAddStream();
+ void slotJumpTo();
+ void showScriptSelector();
++ void resizeWindowHack();
+ #ifdef DEBUG_BUILD_TYPE
+ void showNetworkRequestViewer();
+ #endif // DEBUG_BUILD_TYPE