rev 11872 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-08-08 09:59:31 +0000 (Fri, 08 Aug 2008)
New Revision: 11872

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/23_fix_systray.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
Bump Standards-Version to 3.8.0 (no changes needed).
Add patch to fix system tray with Qt4.4.1.


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-08-08 06:54:49 UTC (rev 11871)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-08-08 09:59:31 UTC (rev 11872)
@@ -4,6 +4,11 @@
 
   * Move ksysguard* to utils section.
 
+  +++ Changes by Fathi Boudra:
+
+  * Bump Standards-Version to 3.8.0 (no changes needed).
+  * Add patch to fix system tray with Qt4.4.1.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Aug 2008 15:40:50 +0200
 
 kdebase-workspace (4:4.1.0-1) experimental; urgency=low

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-08-08 06:54:49 UTC (rev 11871)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-08-08 09:59:31 UTC (rev 11872)
@@ -12,7 +12,7 @@
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, network-manager-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
  libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace
 Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/kdebase-workspace

Added: branches/kde4/packages/kdebase-workspace/debian/patches/23_fix_systray.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/23_fix_systray.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/23_fix_systray.diff	2008-08-08 09:59:31 UTC (rev 11872)
@@ -0,0 +1,36 @@
+--- a/plasma/applets/systemtray/systemtray.cpp
++++ b/plasma/applets/systemtray/systemtray.cpp
+@@ -24,6 +24,7 @@
+ #include "systemtray.h"
+ 
+ // Qt
++#include <QApplication>
+ #include <QGraphicsView>
+ #include <QTimer>
+ 
+@@ -35,6 +36,25 @@
+       m_startUpDelayShowTimer(0),
+       m_showOwnBackground(false)
+ {
++    // Revert to Qt-4.4.0 behaviour so that the SystemTrayWidget is always on
++    // top. Note, if a sibling widget requires a native window for other
++    // reasons the problem could reoccur.
++    // Another alternative is to raise() during SystemTrayWidget construction
++    // and then have it listen for ChildAdded events on its parent. However,
++    // this causes a lot of flashes of white and so should be avoided if
++    // possible.
++    // See http://bugs.kde.org/show_bug.cgi?id=168007
++    // and http://mail.kde.org/pipermail/plasma-devel/2008-August/000258.html
++
++#if QT_VERSION < 0x040401
++    Qt::ApplicationAttribute attr = (Qt::ApplicationAttribute)4;
++#else
++    Qt::ApplicationAttribute attr = Qt::AA_DontCreateNativeWidgetSiblings;
++#endif
++    if (!QApplication::testAttribute(attr)) {
++        QApplication::setAttribute(attr);
++    }
++
+     m_background = new Plasma::PanelSvg(this);
+     m_background->setImagePath("widgets/systemtray");
+     connect(this, SIGNAL(geometryChanged()), this, SLOT(updateWidgetGeometry()));

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-08-08 06:54:49 UTC (rev 11871)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-08-08 09:59:31 UTC (rev 11872)
@@ -8,3 +8,4 @@
 16_kdm_consolekit.diff
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
+23_fix_systray.diff