Update net-im/telepathy-qt4 to 0.9.7

PR:		211092
Submitted by:	Adriaan de Groot <groot@kde.org>
Approved by:	rakuco (mentor)
Obtained from:	area51 the kde@ development repo

6 files changed, 11 insertions, 125 deletions

diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 002beb213438..6ebb44f5e8f3 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	telepathy-qt4
-PORTVERSION=	0.9.6.1
-PORTREVISION=	1
+PORTVERSION=	0.9.7
 CATEGORIES=	net-im
 MASTER_SITES=	https://telepathy.freedesktop.org/releases/${PORTNAME:C/4//}/
 DISTNAME=	${PORTNAME:C/4//}-${PORTVERSION}
diff --git a/net-im/telepathy-qt4/distinfo b/net-im/telepathy-qt4/distinfo
index adfa14111d0f..f85590c9561e 100644
--- a/net-im/telepathy-qt4/distinfo
+++ b/net-im/telepathy-qt4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (telepathy-qt-0.9.6.1.tar.gz) = 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8
-SIZE (telepathy-qt-0.9.6.1.tar.gz) = 6067468
+TIMESTAMP = 1466432953
+SHA256 (telepathy-qt-0.9.7.tar.gz) = 21bad30be7ebc4ba667d53d92cd1cec1be23114103f2149404d9740721693d4f
+SIZE (telepathy-qt-0.9.7.tar.gz) = 6213405
diff --git a/net-im/telepathy-qt4/files/patch-git_1e1f53e9 b/net-im/telepathy-qt4/files/patch-git_1e1f53e9
deleted file mode 100644
index 6b5bfc30de66..000000000000
--- a/net-im/telepathy-qt4/files/patch-git_1e1f53e9
+++ /dev/null
@@ -1,21 +0,0 @@
-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"
- 
diff --git a/net-im/telepathy-qt4/files/patch-git_7389dc9 b/net-im/telepathy-qt4/files/patch-git_7389dc9
deleted file mode 100644
index 5d139473e6b1..000000000000
--- a/net-im/telepathy-qt4/files/patch-git_7389dc9
+++ /dev/null
@@ -1,20 +0,0 @@
-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})
diff --git a/net-im/telepathy-qt4/files/patch-git_ec4a3d6 b/net-im/telepathy-qt4/files/patch-git_ec4a3d6
deleted file mode 100644
index 3573f75b561c..000000000000
--- a/net-im/telepathy-qt4/files/patch-git_ec4a3d6
+++ /dev/null
@@ -1,79 +0,0 @@
-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)
diff --git a/net-im/telepathy-qt4/pkg-plist b/net-im/telepathy-qt4/pkg-plist
index 9492dbec08ed..253bc19fee9e 100644
--- a/net-im/telepathy-qt4/pkg-plist
+++ b/net-im/telepathy-qt4/pkg-plist
@@ -26,6 +26,7 @@ include/telepathy-qt4/TelepathyQt/BaseCall
 include/telepathy-qt4/TelepathyQt/BaseChannel
 include/telepathy-qt4/TelepathyQt/BaseConnection
 include/telepathy-qt4/TelepathyQt/BaseConnectionManager
+include/telepathy-qt4/TelepathyQt/BaseDebug
 include/telepathy-qt4/TelepathyQt/BaseProtocol
 include/telepathy-qt4/TelepathyQt/BaseProtocolAddressingInterface
 include/telepathy-qt4/TelepathyQt/BaseProtocolAvatarsInterface
@@ -167,6 +168,7 @@ include/telepathy-qt4/TelepathyQt/GenericCapabilityFilter
 include/telepathy-qt4/TelepathyQt/GenericPropertyFilter
 include/telepathy-qt4/TelepathyQt/Global
 include/telepathy-qt4/TelepathyQt/HandledChannelNotifier
+include/telepathy-qt4/TelepathyQt/IODevice
 include/telepathy-qt4/TelepathyQt/IncomingDBusTubeChannel
 include/telepathy-qt4/TelepathyQt/IncomingFileTransferChannel
 include/telepathy-qt4/TelepathyQt/IncomingStreamTubeChannel
@@ -296,6 +298,7 @@ include/telepathy-qt4/TelepathyQt/base-call.h
 include/telepathy-qt4/TelepathyQt/base-channel.h
 include/telepathy-qt4/TelepathyQt/base-connection-manager.h
 include/telepathy-qt4/TelepathyQt/base-connection.h
+include/telepathy-qt4/TelepathyQt/base-debug.h
 include/telepathy-qt4/TelepathyQt/base-protocol.h
 include/telepathy-qt4/TelepathyQt/call-channel.h
 include/telepathy-qt4/TelepathyQt/call-content-media-description.h
@@ -347,6 +350,7 @@ include/telepathy-qt4/TelepathyQt/generic-capability-filter.h
 include/telepathy-qt4/TelepathyQt/generic-property-filter.h
 include/telepathy-qt4/TelepathyQt/global.h
 include/telepathy-qt4/TelepathyQt/handled-channel-notifier.h
+include/telepathy-qt4/TelepathyQt/io-device.h
 include/telepathy-qt4/TelepathyQt/incoming-dbus-tube-channel.h
 include/telepathy-qt4/TelepathyQt/incoming-file-transfer-channel.h
 include/telepathy-qt4/TelepathyQt/incoming-stream-tube-channel.h
@@ -420,7 +424,9 @@ lib/cmake/TelepathyQt4Service/TelepathyQt4ServiceConfigVersion.cmake
 lib/libtelepathy-qt4-farstream.so
 lib/libtelepathy-qt4-farstream.so.2
 lib/libtelepathy-qt4-farstream.so.2.%%PORTVERSION%%
-lib/libtelepathy-qt4-service.a
+lib/libtelepathy-qt4-service.so
+lib/libtelepathy-qt4-service.so.0
+lib/libtelepathy-qt4-service.so.2.%%PORTVERSION%%
 lib/libtelepathy-qt4.so
 lib/libtelepathy-qt4.so.2
 lib/libtelepathy-qt4.so.2.%%PORTVERSION%%