[SCM] libbluedevil packaging branch, master, updated. 6d58daf82c572c52674d4d22e221837d5f2559fd

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 6d58daf82c572c52674d4d22e221837d5f2559fd
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Thu Jul 29 13:05:19 2010 +0300

    Add patch taken from kdelibs to avoid linking on pthreads and finding X11.
---
 .../patches/01_findqt4_optional_x11_pthread.diff   |   17 +++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/patches/01_findqt4_optional_x11_pthread.diff b/debian/patches/01_findqt4_optional_x11_pthread.diff
new file mode 100644
index 0000000..5bc0b5a
--- /dev/null
+++ b/debian/patches/01_findqt4_optional_x11_pthread.diff
@@ -0,0 +1,17 @@
+Qt doesn't expose the X11 headers to the world, so no need to make it required.
+---
+ cmake/modules/Qt4ConfigDependentSettings.cmake |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
++++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
+@@ -27,10 +27,9 @@
+ IF(UNIX)
+   # on OS X X11 may not be required
+   IF (Q_WS_X11)
+-    FIND_PACKAGE(X11 REQUIRED)
++    FIND_PACKAGE(X11)
+   ENDIF (Q_WS_X11)
+   FIND_PACKAGE(Threads)
+-  SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF(UNIX)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..330a28e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_findqt4_optional_x11_pthread.diff

-- 
libbluedevil packaging