summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2013-09-25 16:14:08 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-25 16:42:28 +0200
commit6e81fa9ce19536f7b5c7de37f710a416bb31eaf3 (patch)
tree2e7201676a754d0d45d0f71280d2106c1a645167
parent4626871a9d3778ff1423e8a5405def70ee8a4fba (diff)
downloadtdelibs-6e81fa9ce19536f7b5c7de37f710a416bb31eaf3.tar.gz
tdelibs-6e81fa9ce19536f7b5c7de37f710a416bb31eaf3.zip
Add new build option WITH_XCOMPOSITE
Fix build without xcomposite This resolves Bug 1289
-rw-r--r--CMakeLists.txt14
-rw-r--r--tdecore/tdeapplication.cpp12
2 files changed, 14 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 487d9faaa..9bce50de8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,7 @@ OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KD
OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
OPTION( WITH_XRANDR "Build the tderandr library" ON )
+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
@@ -621,10 +622,15 @@ endif( XRENDER_FOUND )
##### check for xcomposite #########################
-pkg_search_module( XCOMPOSITE xcomposite )
-if( XCOMPOSITE_FOUND )
- set( HAVE_XCOMPOSITE 1 )
-endif( XCOMPOSITE_FOUND )
+if( WITH_XCOMPOSITE )
+ pkg_search_module( XCOMPOSITE xcomposite )
+ if( XCOMPOSITE_FOUND )
+ set( HAVE_XCOMPOSITE 1 )
+ else( WITH_XCOMPOSITE )
+ tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
+ endif( XCOMPOSITE_FOUND )
+endif( WITH_XCOMPOSITE )
+
##### check for libxml-2.0 ######################
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 26138f86b..450e522c1 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -201,7 +201,7 @@ static Atom atom_NetSupported;
static Atom kde_xdnd_drop;
#endif
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) && defined(COMPOSITE)
static int composite_event, composite_error, composite_opcode;
static bool x11_composite_error_generated;
static int x11_error(Display *dpy, XErrorEvent *ev) {
@@ -2114,7 +2114,7 @@ bool TDEApplication::isCompositionManagerAvailable() {
return false;
}
-bool TDEApplication::detectCompositionManagerAvailable(bool force_available) {
+bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
const char *home;
struct passwd *p;
p = getpwuid(getuid());
@@ -2156,21 +2156,17 @@ Display* TDEApplication::openX11RGBADisplay() {
return 0;
}
-Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
return 0;
}
-Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
return 0;
}
bool TDEApplication::isX11CompositionAvailable() {
return false;
}
-
-TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) {
- return TDEApplication::TDEApplication(allowStyles, true);
-}
#endif
static bool kapp_block_user_input = false;