1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

Remove dependency on XComposite on X11. It wasn't actually a dependency

on the library, just the development headers (used to check for th
existence of compositing at runtime, but not necessary for us).
This commit is contained in:
Jeff Mitchell
2011-08-29 11:02:37 -04:00
parent bde3d93f6a
commit d5a2e4b325
3 changed files with 8 additions and 1 deletions

View File

@@ -434,7 +434,7 @@ IF( UNIX AND NOT APPLE )
IF( BUILD_GUI AND X11_FOUND ) IF( BUILD_GUI AND X11_FOUND )
INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm ) INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm )
SET( libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp ) SET( libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp )
SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${X11_LIBRARIES} Xcomposite ) SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${X11_LIBRARIES} )
ENDIF() ENDIF()
ENDIF( UNIX AND NOT APPLE ) ENDIF( UNIX AND NOT APPLE )

View File

@@ -30,7 +30,10 @@
#include <unistd.h> #include <unistd.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#if 0
#include <X11/extensions/Xcomposite.h> #include <X11/extensions/Xcomposite.h>
#endif
#include "netwm.h" #include "netwm.h"
@@ -703,6 +706,7 @@ void NETWM::transset(Window window, double d)
XSync(dpy, False); XSync(dpy, False);
} }
#if 0
bool NETWM::isComposite() bool NETWM::isComposite()
{ {
int event_base, error_base; int event_base, error_base;
@@ -722,6 +726,7 @@ bool NETWM::isComposite()
return (owner != None); return (owner != None);
} }
#endif
void NETWM::checkInit() void NETWM::checkInit()
{ {

View File

@@ -82,7 +82,9 @@ public:
static void transset(Window, double); static void transset(Window, double);
#if 0
static bool isComposite(); static bool isComposite();
#endif
static int setProperty(Window, Atom, long, uchar *, int); static int setProperty(Window, Atom, long, uchar *, int);