Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2015-12-01 09:19:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt5/telepathy-qt5.changes 2015-05-19 23:47:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2015-12-01 09:19:22.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 29 14:00:31 UTC 2015 - [email protected] + +- Update to version 0.9.6.1: + + Fixed illegal C++ statement in one of service interfaces. +- Add telepathy-qt5-gst-1_6.patch: Fix build with gstreamer-1.6. + +------------------------------------------------------------------- Old: ---- telepathy-qt-0.9.6.tar.gz New: ---- telepathy-qt-0.9.6.1.tar.gz telepathy-qt5-gst-1_6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ --- /var/tmp/diff_new_pack.1sTNPa/_old 2015-12-01 09:19:23.000000000 +0100 +++ /var/tmp/diff_new_pack.1sTNPa/_new 2015-12-01 09:19:23.000000000 +0100 @@ -20,7 +20,7 @@ %define major 0 Name: telepathy-qt5 -Version: 0.9.6 +Version: 0.9.6.1 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ @@ -28,6 +28,8 @@ Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM telepathy-qt5-gst-1_6.patch [email protected] -- Fix build with gstreamer 1.6 and newer. +Patch0: telepathy-qt5-gst-1_6.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes @@ -81,6 +83,7 @@ %prep %setup -q -n telepathy-qt-%{version} +%patch0 -p1 %build if [ %{_lib} = lib64 ]; then ++++++ telepathy-qt-0.9.6.tar.gz -> telepathy-qt-0.9.6.1.tar.gz ++++++ ++++ 23870 lines of diff (skipped) ++++++ telepathy-qt5-gst-1_6.patch ++++++ >From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider <[email protected]> Date: Tue, 29 Sep 2015 20:52:15 +0200 Subject: [PATCH] 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 <[email protected]> --- TelepathyQt/Farstream/CMakeLists.txt | 2 +- cmake/modules/FindGStreamer.cmake | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) 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) -- 2.6.3
