[patch] patch #2: fixes for buggy qt-gstreamer detector in telepathy-logger-qt

telepathy-logger-qt-0.5.0-fix-buggy-qtglib-detector.patch (text/plain), 1.49 KB, created by Alex Turbov on 2012-09-05 07:27:22 UTC

diff -ru telepathy-logger-qt-0.5.0.origin/cmake/modules/FindQtGLib.cmake telepathy-logger-qt-0.5.0/cmake/modules/FindQtGLib.cmake
--- telepathy-logger-qt-0.5.0.origin/cmake/modules/FindQtGLib.cmake	2012-08-24 17:05:57.000000000 +0400
+++ telepathy-logger-qt-0.5.0/cmake/modules/FindQtGLib.cmake	2012-09-05 11:03:35.000000000 +0400
@@ -27,18 +27,22 @@
         PKG_CHECK_MODULES(PC_QTGLIB QtGLib-2.0)
     endif (QTGLIB_MIN_VERSION)
     set(QTGLIB_DEFINITIONS ${PC_QTGLIB_CFLAGS_OTHER})
+    # NOTE Do not lose all include directories! It can be more than just a single /usr/include/QtGStreamer!
+    # BUG https://bugs.gentoo.org/show_bug.cgi?id=432976
+    set(QTGLIB_INCLUDE_DIR ${PC_QTGLIB_INCLUDE_DIRS})
+else (NOT WIN32)
+    # TODO Obviously it would be buggy in a Windows, but I have no idea how to fix it...
+    find_path(QTGLIB_INCLUDE_DIR
+        NAMES QGlib/Object
+        PATHS ${PC_QTGLIB_INCLUDEDIR} ${PC_QTGLIB_INCLUDE_DIRS}
+        PATH_SUFFIXES QtGStreamer
+      )
 endif (NOT WIN32)
 
-find_path(QTGLIB_INCLUDE_DIR 
-   NAMES QGlib/Object
-   PATHS ${PC_QTGLIB_INCLUDEDIR} ${PC_QTGLIB_INCLUDE_DIRS} 
-   PATH_SUFFIXES QtGStreamer
-   )
-
-find_library(QTGLIB_LIBRARIES 
-   NAMES QtGLib-2.0
-   PATHS ${PC_QTGLIB_LIBDIR} ${PC_QTGLIB_LIBRARY_DIRS}
-   )
+find_library(QTGLIB_LIBRARIES
+    NAMES QtGLib-2.0
+    PATHS ${PC_QTGLIB_LIBDIR} ${PC_QTGLIB_LIBRARY_DIRS}
+  )
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(QtGLib-2.0 DEFAULT_MSG QTGLIB_LIBRARIES QTGLIB_INCLUDE_DIR)