Permalink
Browse files

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).
  • Loading branch information...
1 parent bde3d93 commit d5a2e4b325bd51f567a48512029842f3e360f3ea @jefferai jefferai committed Aug 29, 2011
@@ -434,7 +434,7 @@ IF( UNIX AND NOT APPLE )
IF( BUILD_GUI AND X11_FOUND )
INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm )
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( UNIX AND NOT APPLE )
@@ -30,7 +30,10 @@
#include <unistd.h>
#include <X11/Xutil.h>
+
+#if 0
#include <X11/extensions/Xcomposite.h>
+#endif
#include "netwm.h"
@@ -703,6 +706,7 @@ void NETWM::transset(Window window, double d)
XSync(dpy, False);
}
+#if 0
bool NETWM::isComposite()
{
int event_base, error_base;
@@ -722,6 +726,7 @@ bool NETWM::isComposite()
return (owner != None);
}
+#endif
void NETWM::checkInit()
{
@@ -82,7 +82,9 @@ class NETWM
static void transset(Window, double);
+#if 0
static bool isComposite();
+#endif
static int setProperty(Window, Atom, long, uchar *, int);

0 comments on commit d5a2e4b

Please sign in to comment.