telepathy-qt5:add dep and patch
This commit is contained in:
alihanozturk
@@ -1,37 +0,0 @@
|
||||
From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001
|
||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
||||
Date: Sun, 29 Sep 2013 22:19:27 +0000
|
||||
Subject: Fix compilation on new versions of cmake
|
||||
|
||||
Recent cmake has changed the argument count to
|
||||
qt4_create_moc_command, we need to adjust accordingly
|
||||
|
||||
Reviewed-by: Dario Freddi <dario.freddi@ispirata.com>
|
||||
---
|
||||
diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
|
||||
index c2eac76..b3131f0 100644
|
||||
--- a/cmake/modules/FindQt.cmake
|
||||
+++ b/cmake/modules/FindQt.cmake
|
||||
@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
|
||||
|
||||
MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
|
||||
IF(QT_VERSION_MAJOR MATCHES 4)
|
||||
- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
|
||||
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
|
||||
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
|
||||
+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
ELSE(QT_VERSION_MAJOR MATCHES 4)
|
||||
IF(QT_VERSION_MAJOR MATCHES 5)
|
||||
- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
|
||||
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
|
||||
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
|
||||
+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
|
||||
ENDIF(QT_VERSION_MAJOR MATCHES 5)
|
||||
ENDIF(QT_VERSION_MAJOR MATCHES 4)
|
||||
ENDMACRO(QT_CREATE_MOC_COMMAND)
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@@ -0,0 +1,82 @@
|
||||
From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001
|
||||
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
|
||||
Date: Tue, 29 Sep 2015 20:52:15 +0200
|
||||
Subject: 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>
|
||||
|
||||
diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
|
||||
index 250bfdb..dd71430 100644
|
||||
--- a/TelepathyQt/Farstream/CMakeLists.txt
|
||||
+++ b/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})
|
||||
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
|
||||
index 63fb41c..ffdd7a9 100644
|
||||
--- a/cmake/modules/FindGStreamer.cmake
|
||||
+++ b/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)
|
||||
--
|
||||
cgit v0.10.2
|
||||
@@ -16,7 +16,9 @@
|
||||
<Archive sha1sum="a593e0d107c36ed4d79cb84e7eab81a7d9d85019" type="targz">http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>qt5-doc</Dependency>
|
||||
<Dependency>qt5-base-devel</Dependency>
|
||||
<Dependency>qt5-assistant-devel</Dependency>
|
||||
<Dependency>gobject-introspection-devel</Dependency>
|
||||
<Dependency>dbus-glib-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
@@ -25,7 +27,7 @@
|
||||
<Dependency>doxygen</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">cmake.patch</Patch> -->
|
||||
<Patch level="1">gstreamer-1.6.patch</Patch>
|
||||
<Patch level="1">glibc-2.20.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
@@ -52,6 +54,8 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">telepathy-qt5</Dependency>
|
||||
<Dependency>qt5-base-devel</Dependency>
|
||||
<Dependency>telepathy-glib-devel</Dependency>
|
||||
<Dependency>telepathy-farstream-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
@@ -61,7 +65,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2015-08-20</Date>
|
||||
<Date>2016-03-30</Date>
|
||||
<Version>0.9.6</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Alihan Öztürk</Name>
|
||||
|
||||
Reference in New Issue
Block a user