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

[Modestas Vainius]

Author: modax-guest
Date: 2009-02-01 18:36:10 +0000 (Sun, 01 Feb 2009)
New Revision: 13701

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
Log:
Add 25_task.h_forward_decl_netwininfo.diff which gets rid of NETWinInfo
header dependency (and as a result, x11 header dependencies) in task.h
(Closes: 499061).

CAUTION: might cause workspace to FTFBS due to missing X11 includes which
used to be implicit. Untested.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-01 17:25:20 UTC (rev 13700)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-01 18:36:10 UTC (rev 13701)
@@ -5,6 +5,9 @@
   * Make plasma-scriptengines recommend plasma-scriptengine-superkaramba.
   * Move greeters from libs/kdm to kdebase-workspace-bin to make unlocking
     work without kdm installed (Closes: #513734).
+  * Add 25_task.h_forward_decl_netwininfo.diff which gets rid of NETWinInfo
+    header dependency (and as a result, x11 header dependencies) in task.h
+    (Closes: #499061).
 
   +++ Changes by Armin Berres:
 
@@ -17,7 +20,7 @@
 
   * Add replaces: systemsettings (<< 4:4.1.80) (Closes: #507380)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 03:30:42 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 20:29:36 +0200
 
 kdebase-workspace (4:4.2.0-1) experimental; urgency=low
 

Added: branches/kde4.2/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	2009-02-01 18:36:10 UTC (rev 13701)
@@ -0,0 +1,19 @@
+Use forward declaration for NETWinInfo class
+instead of including KDE/NETWinInfo header,
+which in turn includes much X stuff
+--- a/libs/taskmanager/task.h
++++ b/libs/taskmanager/task.h
+@@ -34,11 +34,12 @@
+ // KDE
+ #include <KDE/KSharedPtr>
+ #include <KDE/KWindowSystem>
+-#include <KDE/NETWinInfo>
+ 
+ #include <taskmanager/taskmanager.h>
+ #include <taskmanager/taskmanager_export.h>
+ 
++class NETWinInfo;
++
+ namespace TaskManager
+ {
+ 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-01 17:25:20 UTC (rev 13700)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-01 18:36:10 UTC (rev 13701)
@@ -10,4 +10,5 @@
 22_execute_ktrash4.diff
 23_do_not_depend_on_bindings.diff
 24_do_not_search_for_libeet.diff
+25_task.h_forward_decl_netwininfo.diff
 97_fix_target_link_libraries.diff