summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-24 00:46:39 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-24 01:00:59 -0500
commit72db649bc3ed62e557bb45c62a571a4481c7a876 (patch)
treee411a712736eb37ee52351a66385cdaa0719c384
parent1c6a316b2c20d1ca4eb8a1922a6942ee9c779e5f (diff)
downloadpackages-72db649bc3ed62e557bb45c62a571a4481c7a876.tar.gz
packages-72db649bc3ed62e557bb45c62a571a4481c7a876.tar.bz2
packages-72db649bc3ed62e557bb45c62a571a4481c7a876.tar.xz
packages-72db649bc3ed62e557bb45c62a571a4481c7a876.zip
user/ktorrent: modernise, fix build on Qt 5.9.6
-rw-r--r--user/ktorrent/APKBUILD10
-rw-r--r--user/ktorrent/qtimer.patch29
2 files changed, 35 insertions, 4 deletions
diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD
index 610907026..f239a08a3 100644
--- a/user/ktorrent/APKBUILD
+++ b/user/ktorrent/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktorrent
pkgver=5.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="BitTorrent client by KDE"
url="https://www.kde.org/applications/internet/ktorrent/"
arch="all"
@@ -15,9 +15,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
kcmutils-dev kparts-dev kservice-dev solid-dev kwidgetsaddons-dev
kwindowsystem-dev kxmlgui-dev libktorrent-dev taglib-dev kplotting-dev
kdnssd-dev plasma-workspace-dev"
-install=""
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/ktorrent/5.1/ktorrent-$pkgver.tar.xz"
+source="https://download.kde.org/stable/ktorrent/5.1/ktorrent-$pkgver.tar.xz
+ qtimer.patch
+ "
build() {
cd "$builddir"
@@ -45,4 +46,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25 ktorrent-5.1.0.tar.xz"
+sha512sums="7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25 ktorrent-5.1.0.tar.xz
+94972e958b44850686d6853090bb0ba7b709b68f5b3c8715c42c1cab602ce2b22710fc120bad4a1cc824fc6de9e9aedc94f5bb8b9f9d31170d24adaefabdce28 qtimer.patch"
diff --git a/user/ktorrent/qtimer.patch b/user/ktorrent/qtimer.patch
new file mode 100644
index 000000000..efbf740c0
--- /dev/null
+++ b/user/ktorrent/qtimer.patch
@@ -0,0 +1,29 @@
+From 6d7433d44c7f18cd84d2de105beb5c646ed0e355 Mon Sep 17 00:00:00 2001
+From: Adriaan de Groot <groot@kde.org>
+Date: Tue, 24 Apr 2018 19:15:32 +0200
+Subject: QTimer may not be an incomplete type as it is used as a member
+ variable. Add the #include to fully define the type. This problem shows up
+ when this header is included in a context that doesn't already have QTimer
+ included -- CMake 3.11 exposes that accidentally.
+
+Upstreamed from FreeBSD ports.
+---
+ ktorrent/dialogs/torrentcreatordlg.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h
+index 68dde8a..12a1a43 100644
+--- a/ktorrent/dialogs/torrentcreatordlg.h
++++ b/ktorrent/dialogs/torrentcreatordlg.h
+@@ -23,6 +23,8 @@
+ #define KT_TORRENTCREATORDLG_HH
+
+ #include <QDialog>
++#include <QTimer>
++
+ #include "ui_torrentcreatordlg.h"
+ #include <torrent/torrentcreator.h>
+
+--
+cgit v0.11.2
+