From 43a953e2788424ca588ef96dafba41c8c1fee618 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Mon, 8 Feb 2016 08:35:36 +0700 Subject: [PATCH] multimedia/telepathy-qt: Updated for version 0.9.6.1. Signed-off-by: Willy Sudiarto Raharjo --- multimedia/telepathy-qt/glibc.patch | 26 ++++++ multimedia/telepathy-qt/gstreamer.patch | 84 +++++++++++++++++++ .../telepathy-qt/telepathy-qt.SlackBuild | 10 ++- multimedia/telepathy-qt/telepathy-qt.info | 6 +- 4 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 multimedia/telepathy-qt/glibc.patch create mode 100644 multimedia/telepathy-qt/gstreamer.patch diff --git a/multimedia/telepathy-qt/glibc.patch b/multimedia/telepathy-qt/glibc.patch new file mode 100644 index 0000000000..ce9af921ec --- /dev/null +++ b/multimedia/telepathy-qt/glibc.patch @@ -0,0 +1,26 @@ +From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider +Date: Fri, 5 Jun 2015 12:47:13 +0200 +Subject: CMake: Fixed deprecated _BSD_SOURCE. + +Since glibc-2.20 _DEFAULT_SOURCE definition is also required. + +Reviewed-by: Alexandr Akulich + +diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake +index d34b24d..dc98697 100644 +--- a/cmake/modules/TelepathyDefaults.cmake ++++ b/cmake/modules/TelepathyDefaults.cmake +@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif(${NOT_RELEASE} EQUAL 1) + + if(CMAKE_SYSTEM_NAME MATCHES Linux) +- add_definitions(-D_BSD_SOURCE) ++ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) + endif(CMAKE_SYSTEM_NAME MATCHES Linux) + + # Compiler coverage +-- +cgit v0.10.2 + + diff --git a/multimedia/telepathy-qt/gstreamer.patch b/multimedia/telepathy-qt/gstreamer.patch new file mode 100644 index 0000000000..e495b22419 --- /dev/null +++ b/multimedia/telepathy-qt/gstreamer.patch @@ -0,0 +1,84 @@ +From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider +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 + +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 + + diff --git a/multimedia/telepathy-qt/telepathy-qt.SlackBuild b/multimedia/telepathy-qt/telepathy-qt.SlackBuild index fca2cefe8b..dff471b816 100644 --- a/multimedia/telepathy-qt/telepathy-qt.SlackBuild +++ b/multimedia/telepathy-qt/telepathy-qt.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=telepathy-qt -VERSION=${VERSION:-0.9.6} +VERSION=${VERSION:-0.9.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix around new glibc and gstreamer +# Thanks to ARCH Linux +patch -p1 < $CWD/glibc.patch +patch -p1 < $CWD/gstreamer.patch + mkdir -p build cd build cmake \ @@ -76,7 +81,10 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DDESIRED_QT_VERSION=4 \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_TESTS=OFF \ .. make make install DESTDIR=$PKG diff --git a/multimedia/telepathy-qt/telepathy-qt.info b/multimedia/telepathy-qt/telepathy-qt.info index aa250e06b3..1f7bb2aa47 100644 --- a/multimedia/telepathy-qt/telepathy-qt.info +++ b/multimedia/telepathy-qt/telepathy-qt.info @@ -1,8 +1,8 @@ PRGNAM="telepathy-qt" -VERSION="0.9.6" +VERSION="0.9.6.1" HOMEPAGE="http://telepathy.freedesktop.org/doc/telepathy-qt/" -DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.tar.gz" -MD5SUM="1f18935f30dcf90282a2d6d65fcde752" +DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.1.tar.gz" +MD5SUM="bebebfbe29d194a9ba00b4f422a44f74" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="telepathy-farstream"