From 644135c88ac43bdf07acd990ca2a380f06ffb8da Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Sat, 27 Aug 2011 16:21:19 -0400
Subject: [PATCH] Move libqnetwm down one level and hopefully fix building for
 leo

---
 src/libtomahawk/CMakeLists.txt                 | 5 ++---
 src/libtomahawk/utils/tomahawkutils.cpp        | 2 +-
 thirdparty/libqnetwm/{ => libqnetwm}/fixx11h.h | 0
 thirdparty/libqnetwm/{ => libqnetwm}/netwm.cpp | 0
 thirdparty/libqnetwm/{ => libqnetwm}/netwm.h   | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename thirdparty/libqnetwm/{ => libqnetwm}/fixx11h.h (100%)
 rename thirdparty/libqnetwm/{ => libqnetwm}/netwm.cpp (100%)
 rename thirdparty/libqnetwm/{ => libqnetwm}/netwm.h (100%)

diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index bf7f2fd53..b63f650b7 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -415,8 +415,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
     ${LIBPORTFWD_INCLUDE_DIR}
     ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb
 
-    # For thirdparty/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
 IF( UNIX AND NOT APPLE )
@@ -434,7 +432,8 @@ IF( UNIX AND NOT APPLE )
       infosystem/infoplugins/unix/fdonotifyplugin.h )
 
     IF( BUILD_GUI AND X11_FOUND )
-        SET( libSources ${libSources} ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/libqnetwm/netwm.cpp )
+        INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm )
+        SET( libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp )
         SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${X11_LIBRARIES} Xcomposite )
     ENDIF()
 ENDIF( UNIX AND NOT APPLE )
diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index 923f1d2ac..14df50094 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -46,7 +46,7 @@
 
     #ifdef Q_WS_X11
         #include <QtGui/QX11Info>
-        #include "thirdparty/libqnetwm/netwm.h"
+        #include <libqnetwm/netwm.h>
     #endif
 
     #ifdef Q_WS_WIN
diff --git a/thirdparty/libqnetwm/fixx11h.h b/thirdparty/libqnetwm/libqnetwm/fixx11h.h
similarity index 100%
rename from thirdparty/libqnetwm/fixx11h.h
rename to thirdparty/libqnetwm/libqnetwm/fixx11h.h
diff --git a/thirdparty/libqnetwm/netwm.cpp b/thirdparty/libqnetwm/libqnetwm/netwm.cpp
similarity index 100%
rename from thirdparty/libqnetwm/netwm.cpp
rename to thirdparty/libqnetwm/libqnetwm/netwm.cpp
diff --git a/thirdparty/libqnetwm/netwm.h b/thirdparty/libqnetwm/libqnetwm/netwm.h
similarity index 100%
rename from thirdparty/libqnetwm/netwm.h
rename to thirdparty/libqnetwm/libqnetwm/netwm.h