From d5a2e4b325bd51f567a48512029842f3e360f3ea Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Mon, 29 Aug 2011 11:02:37 -0400
Subject: [PATCH] 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).

---
 src/libtomahawk/CMakeLists.txt           | 2 +-
 thirdparty/libqnetwm/libqnetwm/netwm.cpp | 5 +++++
 thirdparty/libqnetwm/libqnetwm/netwm.h   | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index b63f650b7..eeabc3471 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -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 )
 
diff --git a/thirdparty/libqnetwm/libqnetwm/netwm.cpp b/thirdparty/libqnetwm/libqnetwm/netwm.cpp
index ed0a51157..6f92b4923 100644
--- a/thirdparty/libqnetwm/libqnetwm/netwm.cpp
+++ b/thirdparty/libqnetwm/libqnetwm/netwm.cpp
@@ -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()
 {
diff --git a/thirdparty/libqnetwm/libqnetwm/netwm.h b/thirdparty/libqnetwm/libqnetwm/netwm.h
index 8fec8d772..8f02db4a1 100644
--- a/thirdparty/libqnetwm/libqnetwm/netwm.h
+++ b/thirdparty/libqnetwm/libqnetwm/netwm.h
@@ -82,7 +82,9 @@ public:
 
     static void transset(Window, double);
 
+#if 0
     static bool isComposite();
+#endif
 
     static int setProperty(Window, Atom, long, uchar *, int);