Attachment 939 Details for Bug 1289 – fixes the compilation without xcomposite

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] fixes the compilation without xcomposite

tdelibs-fix-no-xcomposite.patch (text/plain), 1.39 KB, created by Alexander Golubev (Fat-Zer) on 2012-10-26 02:54:55 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2012-10-26 02:54:55 CDT

Size: 1.39 KB

patch

obsolete

>diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
>index b4caefc..b4ec1a2 100644
>--- a/tdecore/kapplication.cpp
>+++ b/tdecore/kapplication.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 KApplication::isCompositionManagerAvailable() {
> 	return false;
> }
> 
>-bool KApplication::detectCompositionManagerAvailable(bool force_available) {
>+bool KApplication::detectCompositionManagerAvailable(bool force_available, bool /* available */) {
> 	const char *home;
> 	struct passwd *p;
> 	p = getpwuid(getuid());
>@@ -2025,21 +2025,17 @@ Display* KApplication::openX11RGBADisplay() {
> 	return 0;
> }
> 
>-Qt::HANDLE KApplication::getX11RGBAVisual(char *display) {
>+Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
> 	return 0;
> }
> 
>-Qt::HANDLE KApplication::getX11RGBAColormap(char *display) {
>+Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
> 	return 0;
> }
> 
> bool KApplication::isX11CompositionAvailable() {
> 	return false;
> }
>-
>-KApplication KApplication::KARGBApplication( bool allowStyles ) {
>-	return KApplication::KApplication(allowStyles, true);
>-}
> #endif
> 
> static bool kapp_block_user_input = false;

Actions: View | Diff

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