Attachment 1316 Details for Bug 1289 – 02-tdelibs-make-xcomposite-optional.patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] 02-tdelibs-make-xcomposite-optional.patch

02-tdelibs-make-xcomposite-optional.patch (text/plain), 2.61 KB, created by Alexander Golubev (Fat-Zer) on 2013-06-29 18:48:19 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2013-06-29 18:48:19 CDT

Size: 2.61 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 1163214..34397b5 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -92,5 +92,6 @@ OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)"
> OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
> OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
>+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
> 
> OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
>@@ -602,10 +603,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 )
>+    message(FATAL_ERROR "\nxcomposite 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 58b010e..2850127 100644
>--- a/tdecore/tdeapplication.cpp
>+++ b/tdecore/tdeapplication.cpp
>@@ -186,7 +186,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) {
>@@ -1983,7 +1983,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());
>@@ -2025,21 +2025,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;

Actions: View | Diff

Attachments on bug 1289: 938 | 939 | 941 | 1314 | 1315 | 1316