From cde570c03613886b79e2bc35cb7642aa35fca298 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Sun, 3 May 2020 10:29:30 +0200 Subject: [PATCH] temp/ktp-common-internals: drop, required version is upstream --- ...r-the-preferred-text-channel-handler.patch | 25 ---------- temp/ktp-common-internals/APKBUILD | 46 ------------------- 2 files changed, 71 deletions(-) delete mode 100644 temp/ktp-common-internals/0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch delete mode 100644 temp/ktp-common-internals/APKBUILD diff --git a/temp/ktp-common-internals/0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch b/temp/ktp-common-internals/0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch deleted file mode 100644 index 85160c9e6..000000000 --- a/temp/ktp-common-internals/0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f35dc4fceeecf3051ba46a19356fa8d67793da50 Mon Sep 17 00:00:00 2001 -From: Martin Klapetek -Date: Wed, 24 Feb 2016 15:45:03 -0500 -Subject: [PATCH] [KTp] Make SpaceBar the preferred text channel handler - ---- - KTp/actions.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/KTp/actions.cpp b/KTp/actions.cpp -index 17d631f..8a29171 100644 ---- a/KTp/actions.cpp -+++ b/KTp/actions.cpp -@@ -32,7 +32,7 @@ - #include - #include - --#define PREFERRED_TEXT_CHAT_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.KTp.TextUi") -+#define PREFERRED_TEXT_CHAT_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.SpaceBar") - #define PREFERRED_FILE_TRANSFER_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.KTp.FileTransfer") - #define PREFERRED_AUDIO_VIDEO_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.KTp.CallUi") - #define PREFERRED_RFB_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.krfb_rfb_handler") --- -2.25.0 - diff --git a/temp/ktp-common-internals/APKBUILD b/temp/ktp-common-internals/APKBUILD deleted file mode 100644 index d07fa0a1e..000000000 --- a/temp/ktp-common-internals/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Forked from Alpine to build with commits not in any release yet but required for Spacebar to launch -# Will be made obsolete once KDE Applications 20.04 is in the repositories -pkgname=ktp-common-internals -pkgver=9999_git20200217 -pkgrel=0 -_commit="abe3dbf9f890e6d905e21a845d386268e6cbb717" -pkgdesc="Library for KTp" -url="https://github.com/kde/ktp-common-internals" -arch="all !armhf" # armhf blocked by extra-cmake-modules -license="LGPL-2.1-only AND GPL-2.0-only" -depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kcoreaddons-dev knotifications-dev kio-dev kwidgetsaddons-dev kcmutils-dev knotifyconfig-dev ktexteditor-dev kwallet-dev kconfig-dev kwindowsystem-dev kemoticons-dev kiconthemes-dev kpeople-dev telepathy-qt-dev" -makedepends="$depends_dev extra-cmake-modules doxygen" -#source="https://download.kde.org/stable/release-service/$pkgver/src/ktp-common-internals-$pkgver.tar.xz" -source="$pkgname-$_commit.tar.gz::https://github.com/KDE/ktp-common-internals/archive/$_commit.tar.gz - 0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch" -subpackages="$pkgname-dev" # $pkgname-lang is only available in release packages -options="!check" # No tests -builddir="$srcdir/$pkgname-$_commit" - -prepare() { - default_prepare - - mkdir "$builddir"/build -} - -build() { - cd "$builddir"/build - cmake "$builddir" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - make -} - -check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - cd "$builddir"/build - DESTDIR="$pkgdir" make install -} - -sha512sums="9a282d10aaf68c591ba611099101379f337d963f91ead55b1c091a05af9c69562a19cde288fc3b909ee1301b41547523636229d4f19b05cd0bc29c5a07abcea8 ktp-common-internals-abe3dbf9f890e6d905e21a845d386268e6cbb717.tar.gz -08050d3d40590881f961ae1006ba2430b9f07bedf22cf925527b66d16d93e31c43eb44adbeff8a5bdb747c1993c1e6d6fe8a1f507e03d4c5ec3b15b77559dc1b 0001-KTp-Make-SpaceBar-the-preferred-text-channel-handler.patch"