From kde-commits  Sun Aug 16 18:58:24 2009
From: George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date: Sun, 16 Aug 2009 18:58:24 +0000
To: kde-commits
Subject: branches/KDE/4.3/kdeplasma-addons/applets/lancelot/app/src
Message-Id: <1250449104.968593.1879.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125044911325567

SVN commit 1012081 by gkiagia:

Backport r1011983 to the 4.3 branch.
Minimize the dependencies. XComposite and XDamage are not really used, only XRender is used.
CCMAIL: ivan.cukic@gmail.com


 M  +5 -5      CMakeLists.txt  
 M  +0 -5      QtDisplay.h  


--- branches/KDE/4.3/kdeplasma-addons/applets/lancelot/app/src/CMakeLists.txt #1012080:1012081
@@ -9,17 +9,17 @@
 # Checking for Composite Begin                          #
 #########################################################
 
-if(X11_Xcomposite_FOUND AND X11_Xdamage_FOUND )
+if(X11_Xrender_FOUND )
     set( LANCELOT_HAVE_COMPOSITING 1 )
-endif( X11_Xcomposite_FOUND AND X11_Xdamage_FOUND )
+endif( X11_Xrender_FOUND )
 
 macro_log_feature(LANCELOT_HAVE_COMPOSITING
-   "Compositing support"
-   "X11 Compositing support"
+   "XRender"
+   "Lancelot compositing support"
    "http://www.x.org/"
    FALSE
    ""
-   "STRONGLY_RECOMMENDED: XComposite and XDamage extensions are required for Lancelot compositing support")
+   "STRONGLY_RECOMMENDED: XRender extension is required for Lancelot compositing support")
 
 
 configure_file(config-lancelot.h.cmake
--- branches/KDE/4.3/kdeplasma-addons/applets/lancelot/app/src/QtDisplay.h #1012080:1012081
@@ -33,12 +33,7 @@
 #include <QTimer>
 #include <QMainWindow>
 
-#include <X11/Xlib.h>
-#include <X11/extensions/composite.h>
-#include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xrender.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/Xdamage.h>
 
 /**
  About QtDisplay Class