TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Add new build option WITH_XCOMPOSITE

Browse Source 
Fix build without xcomposite
This resolves Bug 1289
(cherry picked from commit 6e81fa9ce1)
v3.5.13-sru
Alexander Golubev 11 years ago committed by Slávek Banko
parent e8a9c63d92
commit 37c097719c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

14
CMakeLists.txt
Unescape View File

@ -86,6 +86,7 @@ OPTION( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)"
OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) 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_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
OPTION( WITH_XRANDR "Build the krandr library" ON ) OPTION( WITH_XRANDR "Build the krandr library" ON )
OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
@ -612,10 +613,15 @@ endif( XRENDER_FOUND )
##### check for xcomposite ######################### ##### check for xcomposite #########################
pkg_search_module( XCOMPOSITE xcomposite ) if( WITH_XCOMPOSITE )
if( XCOMPOSITE_FOUND ) pkg_search_module( XCOMPOSITE xcomposite )
set( HAVE_XCOMPOSITE 1 ) if( XCOMPOSITE_FOUND )
endif( 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 ###################### ##### check for libxml-2.0 ######################

12
kdecore/kapplication.cpp
Unescape View File

@ -186,7 +186,7 @@ static Atom atom_NetSupported;
static Atom kde_xdnd_drop; static Atom kde_xdnd_drop;
#endif #endif
#ifdef Q_WS_X11 #if defined(Q_WS_X11) && defined(COMPOSITE)
static int composite_event, composite_error, composite_opcode; static int composite_event, composite_error, composite_opcode;
static bool x11_composite_error_generated; static bool x11_composite_error_generated;
static int x11_error(Display *dpy, XErrorEvent *ev) { static int x11_error(Display *dpy, XErrorEvent *ev) {
@ -1981,7 +1981,7 @@ bool KApplication::isCompositionManagerAvailable() {
return false; return false;
} }
bool KApplication::detectCompositionManagerAvailable(bool force_available) { bool KApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
const char *home; const char *home;
struct passwd *p; struct passwd *p;
p = getpwuid(getuid()); p = getpwuid(getuid());
@ -2023,21 +2023,17 @@ Display* KApplication::openX11RGBADisplay() {
return 0; return 0;
} }
Qt::HANDLE KApplication::getX11RGBAVisual(char *display) { Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
return 0; return 0;
} }
Qt::HANDLE KApplication::getX11RGBAColormap(char *display) { Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
return 0; return 0;
} }
bool KApplication::isX11CompositionAvailable() { bool KApplication::isX11CompositionAvailable() {
return false; return false;
} }
KApplication KApplication::KARGBApplication( bool allowStyles ) {
return KApplication::KApplication(allowStyles, true);
}
#endif #endif
static bool kapp_block_user_input = false; static bool kapp_block_user_input = false;

Write Preview
Loading…
Cancel
Save