From 2abcb72ccc90cb1361edf19273d4a1dae690cf4a Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 13 Oct 2019 17:55:28 +0200 Subject: Remove telepathy dependencies and stop building KDE Telepathy --- deps/telepathy/telepathy-qt5/.url | 1 - .../telepathy-qt5/patches/glibc-2.20.patch | 25 ----- .../telepathy-qt5/patches/gstreamer-1.0.patch | 106 ------------------ deps/telepathy/telepathy-qt5/slack-desc | 19 ---- .../telepathy-qt5/telepathy-qt5.SlackBuild | 121 --------------------- 5 files changed, 272 deletions(-) delete mode 100644 deps/telepathy/telepathy-qt5/.url delete mode 100644 deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch delete mode 100644 deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch delete mode 100755 deps/telepathy/telepathy-qt5/slack-desc delete mode 100755 deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild (limited to 'deps/telepathy/telepathy-qt5') diff --git a/deps/telepathy/telepathy-qt5/.url b/deps/telepathy/telepathy-qt5/.url deleted file mode 100644 index fbfa203..0000000 --- a/deps/telepathy/telepathy-qt5/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.7.tar.gz diff --git a/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch b/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch deleted file mode 100644 index 0366b0f..0000000 --- a/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch deleted file mode 100644 index 403bb3e..0000000 --- a/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch +++ /dev/null @@ -1,106 +0,0 @@ -From c9ce33029e75c104b8a6f04098ba2aaa16df0c30 Mon Sep 17 00:00:00 2001 -From: Iain Lane -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/slack-desc b/deps/telepathy/telepathy-qt5/slack-desc deleted file mode 100755 index c88e8e9..0000000 --- a/deps/telepathy/telepathy-qt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-qt5: telepathy-qt5 (Qt5 bindings for Telepathy) -telepathy-qt5: -telepathy-qt5: This is a library for Qt5-based Telepathy clients. -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: Homepage: http://telepathy.freedesktop.org/doc/telepathy-qt/ -telepathy-qt5: diff --git a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild deleted file mode 100755 index 8426ca6..0000000 --- a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-qt5 -SRCNAM=telepathy-qt -VERSION=${VERSION:-0.9.7} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -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 . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DDESIRED_QT_VERSION=5 \ - -DENABLE_EXAMPLES=OFF \ - -DENABLE_TESTS=OFF \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - -- cgit v1.2.3