This commit is required to avoid occasional build failures in parallel builds

especially after CMake 3.5.0.

commit 1e1f53e9d91684918c34ec50392f86287e001a1e

Author: Alexandr Akulich <akulichalexander@gmail.com>

Date:   Fri Jan 15 18:52:59 2016 +0500

    BaseChannel: Reduced includes (doesn't depend on client stuff anymore).

--- TelepathyQt/base-channel.cpp

+++ TelepathyQt/base-channel.cpp

@@ -26,7 +26,8 @@

 #include "TelepathyQt/_gen/base-channel.moc.hpp"

 #include "TelepathyQt/_gen/base-channel-internal.moc.hpp"

-#include "TelepathyQt/future-internal.h"

+#include "TelepathyQt/_gen/future-constants.h"

+#include "TelepathyQt/_gen/future-types.h"

 #include "TelepathyQt/debug-internal.h"

This commit is required to avoid occasional build failures in parallel builds.

commit 7389dc990c67d4269f3a79c924c054e87f2e4ac5

Author: Alexandr Akulich <akulichalexander@gmail.com>

Date:   Fri, 15 Jan 2016 18:54:09 +0500

    CMakeLists: Added missing service dependence.

    telepathy-qt-service depends on generated stable and future types and consts.

--- TelepathyQt/CMakeLists.txt

+++ TelepathyQt/CMakeLists.txt

@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)

     #endif (ENABLE_COMPILER_COVERAGE)

     # lets build a static only library until we have a stable API/ABI

     add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})

+    add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)

     # generate service moc files

     foreach(moc_src ${telepathy_qt_service_MOC_SRCS})

Required for the port to build with GStreamer 1.6+.

commit ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb

Author: Niels Ole Salscheider <niels_ole@salscheider-online.de>

Date:   Tue Sep 29 20:52:15 2015 +0200

    Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly

    Since GStreamer-1.5.1 config header file moved to LIBDIR.

    Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>

--- TelepathyQt/Farstream/CMakeLists.txt

+++ TelepathyQt/Farstream/CMakeLists.txt

@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND)

     include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}

                         ${TELEPATHY_GLIB_INCLUDE_DIR}

                         ${FARSTREAM_INCLUDE_DIR}

-                        ${GSTREAMER_INCLUDE_DIR}

+                        ${GSTREAMER_INCLUDE_DIRS}

                         ${GLIB2_INCLUDE_DIR}

                         ${LIBXML2_INCLUDE_DIR}

                         ${DBUS_INCLUDE_DIR})

--- cmake/modules/FindGStreamer.cmake

+++ cmake/modules/FindGStreamer.cmake

@@ -13,12 +13,12 @@

 # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)

-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

    # in cache already

    SET(GSTREAMER_FIND_QUIETLY TRUE)

-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

    SET(GSTREAMER_FIND_QUIETLY FALSE)

-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)

 IF (NOT WIN32)

    # use pkg-config to get the directories and then use these values

@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h

    PATH_SUFFIXES gstreamer-1.0

    )

+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h

+   PATHS

+   ${PC_GSTREAMER_INCLUDEDIR}

+   ${PC_GSTREAMER_INCLUDE_DIRS}

+   PATH_SUFFIXES gstreamer-1.0

+   )

+

+SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})

+

 FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0

    PATHS

    ${PC_GSTREAMER_LIBDIR}

@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR)

    MESSAGE(STATUS "GStreamer: WARNING: include dir not found")

 ENDIF (GSTREAMER_INCLUDE_DIR)

+IF (GSTREAMER_CONF_INCLUDE_DIR)

+	#MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")

+ELSE (GSTREAMER_CONF_INCLUDE_DIR)

+   MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")

+ENDIF (GSTREAMER_CONF_INCLUDE_DIR)

+

 IF (GSTREAMER_LIBRARIES)

    #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")

 ELSE (GSTREAMER_LIBRARIES)

@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES)

 INCLUDE(FindPackageHandleStandardArgs)

-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)

+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY)

-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)

+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)