summaryrefslogtreecommitdiffstats
path: root/deps/telepathy
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-12-10 12:39:35 +0100
committer Eric Hameleers <alien@slackware.com>2015-12-10 12:39:35 +0100
commit83c0688ee8dc710286091d30cc1fbaea32ce1554 (patch)
tree7c3013a4dedf0a9a51c2406bc439b464b17d0c75 /deps/telepathy
parent105d02bc290a959153570c5d87dec09a8aaaf300 (diff)
downloadktown-83c0688ee8dc710286091d30cc1fbaea32ce1554.tar.gz
ktown-83c0688ee8dc710286091d30cc1fbaea32ce1554.tar.xz
KDE 5_15.11: recompilations as a result of major library updates in -current.5_15.11
Diffstat (limited to 'deps/telepathy')
-rwxr-xr-xdeps/telepathy/farstream/farstream.SlackBuild2
-rwxr-xr-xdeps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild2
-rwxr-xr-xdeps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild2
-rwxr-xr-xdeps/telepathy/libnice/libnice.SlackBuild2
-rwxr-xr-xdeps/telepathy/libotr/libotr.SlackBuild2
-rwxr-xr-xdeps/telepathy/libsignon-glib/libsignon-glib.SlackBuild2
-rwxr-xr-xdeps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild2
-rwxr-xr-xdeps/telepathy/signon-ui/signon-ui.SlackBuild2
-rwxr-xr-xdeps/telepathy/signon/signon.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-glib/telepathy-glib.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-haze/telepathy-haze.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-logger/telepathy-logger.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild2
-rw-r--r--deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch106
-rwxr-xr-xdeps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild4
19 files changed, 126 insertions, 18 deletions
diff --git a/deps/telepathy/farstream/farstream.SlackBuild b/deps/telepathy/farstream/farstream.SlackBuild
index 63590cf..1986f75 100755
--- a/deps/telepathy/farstream/farstream.SlackBuild
+++ b/deps/telepathy/farstream/farstream.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=farstream
VERSION=${VERSION:-0.2.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
index 558a38a..a0d5296 100755
--- a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
+++ b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=libaccounts-glib
VERSION=${VERSION:-"02d16e50_20150911git"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
index 129bc62..a4e4380 100755
--- a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
+++ b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=libaccounts-qt5
SRCNAM=libaccounts-qt
VERSION=${VERSION:-"13d1af2a_20150911git"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libnice/libnice.SlackBuild b/deps/telepathy/libnice/libnice.SlackBuild
index da2596f..d7c9656 100755
--- a/deps/telepathy/libnice/libnice.SlackBuild
+++ b/deps/telepathy/libnice/libnice.SlackBuild
@@ -27,7 +27,7 @@
PKGNAM=libnice
VERSION=${VERSION:-0.1.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libotr/libotr.SlackBuild b/deps/telepathy/libotr/libotr.SlackBuild
index 00f08f5..470075a 100755
--- a/deps/telepathy/libotr/libotr.SlackBuild
+++ b/deps/telepathy/libotr/libotr.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=libotr
VERSION=${VERSION:-4.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild b/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
index 0cc5ca9..6ab0c4d 100755
--- a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
+++ b/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=libsignon-glib
VERSION=${VERSION:-"1.12"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
index 188249c..ae9fe4e 100755
--- a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
+++ b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=signon-plugin-oauth2
VERSION=${VERSION:-"7b8274da_20150911git"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/signon-ui/signon-ui.SlackBuild b/deps/telepathy/signon-ui/signon-ui.SlackBuild
index 7530296..ac1b400 100755
--- a/deps/telepathy/signon-ui/signon-ui.SlackBuild
+++ b/deps/telepathy/signon-ui/signon-ui.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=signon-ui
SRCNAM=signon-ui
VERSION=${VERSION:-"0.17+15.10.20150810"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/signon/signon.SlackBuild b/deps/telepathy/signon/signon.SlackBuild
index 7eb4215..177792b 100755
--- a/deps/telepathy/signon/signon.SlackBuild
+++ b/deps/telepathy/signon/signon.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=signon
SRCNAM=signond
VERSION=${VERSION:-"d09cb035_20150911git"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
index 9efb634..44adbf7 100755
--- a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
+++ b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-accounts-signon
VERSION=${VERSION:-"1.0"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild b/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
index 51d4345..f5cf4df 100755
--- a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
+++ b/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
@@ -26,7 +26,7 @@
PKGNAM=telepathy-farstream
VERSION=${VERSION:-0.6.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
index 58b95ad..d6d5795 100755
--- a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
+++ b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-gabble
VERSION=${VERSION:-"0.18.3"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
index 5b096f4..714f5fe 100755
--- a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
+++ b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-glib
VERSION=${VERSION:-"0.24.1"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild b/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
index 3861608..cbf12bc 100755
--- a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
+++ b/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-haze
VERSION=${VERSION:-"0.8.0"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild b/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
index db4afa4..fd988b4 100755
--- a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
+++ b/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
@@ -27,7 +27,7 @@
PKGNAM=telepathy-logger-qt5
SRCNAM=telepathy-logger-qt
VERSION=${VERSION:-15.04.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
index 8a0e6bc..94651de 100755
--- a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
+++ b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
@@ -26,7 +26,7 @@
PKGNAM=telepathy-logger
VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
index 9051b37..a6461c5 100755
--- a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
+++ b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-mission-control
VERSION=${VERSION:-"5.16.3"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch
new file mode 100644
index 0000000..403bb3e
--- /dev/null
+++ b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch
@@ -0,0 +1,106 @@
+From c9ce33029e75c104b8a6f04098ba2aaa16df0c30 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain@orangesquash.org.uk>
+Date: Fri, 31 Jul 2015 10:08:51 +0100
+Subject: [PATCH] Fix FindGstreamer.cmake to grab the include directories from
+ gstreamer's pcfile properly
+
+Resolves build failure with gstreamer shipped in some distros.
+---
+ TelepathyQt/Farstream/CMakeLists.txt | 2 +-
+ cmake/modules/FindGStreamer.cmake | 38 ++++++++++++++++++++----------------
+ 2 files changed, 22 insertions(+), 18 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..25ce180 100644
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -2,7 +2,7 @@
+ # Once done this will define
+ #
+ # GSTREAMER_FOUND - system has GStreamer
+-# GSTREAMER_INCLUDE_DIR - the GStreamer include directory
++# GSTREAMER_INCLUDE_DIRS - the GStreamer include directories
+ # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
+ # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
+
+@@ -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
+@@ -31,12 +31,16 @@ IF (NOT WIN32)
+ SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER})
+ ENDIF (NOT WIN32)
+
+-FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+- PATHS
+- ${PC_GSTREAMER_INCLUDEDIR}
+- ${PC_GSTREAMER_INCLUDE_DIRS}
+- PATH_SUFFIXES gstreamer-1.0
+- )
++if (DEFINED PC_GSTREAMER_INCLUDE_DIRS)
++ SET(GSTREAMER_INCLUDE_DIRS ${PC_GSTREAMER_INCLUDE_DIRS})
++ELSE (DEFINED PC_GSTREAMER_INCLUDE_DIRS)
++ FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h
++ PATHS
++ ${PC_GSTREAMER_INCLUDEDIR}
++ ${PC_GSTREAMER_INCLUDE_DIRS}
++ PATH_SUFFIXES gstreamer-1.0
++ )
++ENDIF (DEFINED PC_GSTREAMER_INCLUDE_DIRS)
+
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+ PATHS
+@@ -51,11 +55,11 @@ FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
+ )
+
+
+-IF (GSTREAMER_INCLUDE_DIR)
+- #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}")
+-ELSE (GSTREAMER_INCLUDE_DIR)
+- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+-ENDIF (GSTREAMER_INCLUDE_DIR)
++IF (GSTREAMER_INCLUDE_DIRS)
++ #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIRS}")
++ELSE (GSTREAMER_INCLUDE_DIRS)
++ MESSAGE(STATUS "GStreamer: WARNING: include dirs not found")
++ENDIF (GSTREAMER_INCLUDE_DIRS)
+
+ IF (GSTREAMER_LIBRARIES)
+ #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
+@@ -65,6 +69,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.4.6
+
diff --git a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
index 7d81aa5..301df81 100755
--- a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
+++ b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=telepathy-qt5
SRCNAM=telepathy-qt
VERSION=${VERSION:-0.9.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
@@ -72,6 +72,8 @@ cd $SRCNAM-$VERSION || exit 1
# Compensate for the new glibc:
cat $CWD/patches/glibc-2.20.patch | patch -p1 --verbose || exit 1
+# Compensate for the new gstreamer-1.0:
+cat $CWD/patches/gstreamer-1.0.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \