File search-for-telepathy-farstream-0.4.diff of Package telepathy-qt4

Overview Repositories Revisions Requests Users Attributes Meta

File search-for-telepathy-farstream-0.4.diff of Package telepathy-qt4 (Revision d0dab210676fb6dc498bf0a6084a308c)

Currently displaying revision d0dab210676fb6dc498bf0a6084a308c , Show latest

diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
index 1c608ad..2670265 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
 Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy)
 Description: Qt Telepathy Farstream utility library for the Telepathy framework
 Version: ${PACKAGE_VERSION}
-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
 Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so
 Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
index 1a66d6d..a8ac174 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INC
 Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
 Description: Qt Telepathy Farstream utility library for the Telepathy framework
 Version: ${PACKAGE_VERSION}
-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
 Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream
 Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake
index 74b12d8..215ed28 100644
--- a/cmake/modules/FindTelepathyFarstream.cmake
+++ b/cmake/modules/FindTelepathyFarstream.cmake
@@ -23,9 +23,9 @@ if (NOT WIN32)
     # in the find_path() and find_library() calls
     find_package(PkgConfig)
     if (TELEPATHY_FARSTREAM_MIN_VERSION)
-        PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION})
+        PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4>=${TELEPATHY_FARSTREAM_MIN_VERSION} telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION})
     else (TELEPATHY_FARSTREAM_MIN_VERSION)
-        PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream)
+        PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4 telepathy-farstream)
     endif (TELEPATHY_FARSTREAM_MIN_VERSION)
     set(TELEPATHY_FARSTREAM_DEFINITIONS ${PC_TELEPATHY_FARSTREAM_CFLAGS_OTHER})
 endif (NOT WIN32)
@@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstrea
    PATHS
    ${PC_TELEPATHY_FARSTREAM_INCLUDEDIR}
    ${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS}
-   PATH_SUFFIXES telepathy-1.0
+   PATH_SUFFIXES telepathy-1.0-compat telepathy-1.0
    )
 
-find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream
+find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream-0.4 telepathy-farstream
    PATHS
    ${PC_TELEPATHY_FARSTREAM_LIBDIR}
    ${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS}

Places

File search-for-telepathy-farstream-0.4.diff of Package telepathy-qt4 (Revision d0dab210676fb6dc498bf0a6084a308c)

Places