multimedia/telepathy-qt: Updated for version 0.9.7.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 9 insertions, 124 deletions

diff --git a/multimedia/telepathy-qt/glibc.patch b/multimedia/telepathy-qt/glibc.patch
deleted file mode 100644
index ce9af921ec..0000000000
--- a/multimedia/telepathy-qt/glibc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001
-From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
-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
deleted file mode 100644
index e495b22419..0000000000
--- a/multimedia/telepathy-qt/gstreamer.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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
-
-
diff --git a/multimedia/telepathy-qt/telepathy-qt.SlackBuild b/multimedia/telepathy-qt/telepathy-qt.SlackBuild
index dff471b816..4a584dcc1e 100644
--- a/multimedia/telepathy-qt/telepathy-qt.SlackBuild
+++ b/multimedia/telepathy-qt/telepathy-qt.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for telepathy-qt
 
-# Copyright 2015 Thorn Inurcde USA
+# Copyright 2015-2017 Thorn Inurcde USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=telepathy-qt
-VERSION=${VERSION:-0.9.6.1}
+VERSION=${VERSION:-0.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,11 +69,6 @@ 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 \
diff --git a/multimedia/telepathy-qt/telepathy-qt.info b/multimedia/telepathy-qt/telepathy-qt.info
index 84277afecc..07fc99aa62 100644
--- a/multimedia/telepathy-qt/telepathy-qt.info
+++ b/multimedia/telepathy-qt/telepathy-qt.info
@@ -1,10 +1,10 @@
 PRGNAM="telepathy-qt"
-VERSION="0.9.6.1"
+VERSION="0.9.7"
 HOMEPAGE="https://telepathy.freedesktop.org/doc/telepathy-qt/"
-DOWNLOAD="https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.1.tar.gz"
-MD5SUM="bebebfbe29d194a9ba00b4f422a44f74"
+DOWNLOAD="https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.7.tar.gz"
+MD5SUM="86470dd3d7f6de8b8f4f36165486d42f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="telepathy-farstream"
 MAINTAINER="Thorn Inurcide"
-EMAIL="thorn-inurcide@yandex.com"
+EMAIL="thorn_inurcide@zoho.com"