forked from pool/ktorrent
Accepting request 612383 from KDE:Extra
- Add patches: * fix-build.patch * fix-build-with-Qt-5_11.patch OBS-URL: https://build.opensuse.org/request/show/612383 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=109
This commit is contained in:
Git OBS Bridge
parent
2eafc72a74
commit
98ba9d3ed1
48
fix-build-with-Qt-5_11.patch
Normal file
48
fix-build-with-Qt-5_11.patch
Normal file
@ -0,0 +1,48 @@
|
||||
commit 16691987fdf035f7cafd6c65f7287639ac4cc27f
|
||||
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sun Mar 18 19:13:26 2018 +0100
|
||||
|
||||
Fix build with Qt 5.11 (missing headers)
|
||||
|
||||
Reviewers: stikonas
|
||||
|
||||
Reviewed By: stikonas
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D11456
|
||||
|
||||
diff --git a/ktorrent/dialogs/fileselectdlg.cpp b/ktorrent/dialogs/fileselectdlg.cpp
|
||||
index 139b4752..ec7d8ede 100644
|
||||
--- a/ktorrent/dialogs/fileselectdlg.cpp
|
||||
+++ b/ktorrent/dialogs/fileselectdlg.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "fileselectdlg.h"
|
||||
|
||||
+#include <QButtonGroup>
|
||||
#include <QMenu>
|
||||
#include <QPushButton>
|
||||
#include <QTextCodec>
|
||||
diff --git a/ktorrent/groups/groupview.cpp b/ktorrent/groups/groupview.cpp
|
||||
index 990ed0d3..76208144 100644
|
||||
--- a/ktorrent/groups/groupview.cpp
|
||||
+++ b/ktorrent/groups/groupview.cpp
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <QAction>
|
||||
#include <QDragEnterEvent>
|
||||
#include <QDropEvent>
|
||||
+#include <QHeaderView>
|
||||
#include <QInputDialog>
|
||||
#include <QMenu>
|
||||
#include <QTreeWidgetItemIterator>
|
||||
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
|
||||
index 667e7a82..4be6cd5c 100644
|
||||
--- a/plugins/search/searchprefpage.cpp
|
||||
+++ b/plugins/search/searchprefpage.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "searchprefpage.h"
|
||||
|
||||
+#include <QButtonGroup>
|
||||
#include <QCheckBox>
|
||||
#include <QFile>
|
||||
#include <QInputDialog>
|
||||
24
fix-build.patch
Normal file
24
fix-build.patch
Normal file
@ -0,0 +1,24 @@
|
||||
commit 6d7433d44c7f18cd84d2de105beb5c646ed0e355
|
||||
Author: Adriaan de Groot <groot@kde.org>
|
||||
Date: Tue Apr 24 19:15:32 2018 +0200
|
||||
|
||||
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.
|
||||
|
||||
diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h
|
||||
index 68dde8ad..12a1a433 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>
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 26 09:02:43 UTC 2018 - christophe@krop.fr
|
||||
|
||||
- Add patches:
|
||||
* fix-build.patch
|
||||
* fix-build-with-Qt-5_11.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 24 18:12:30 UTC 2018 - wbauer@tmo.at
|
||||
|
||||
|
||||
153
ktorrent.spec
153
ktorrent.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ktorrent
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -20,9 +20,9 @@ Name: ktorrent
|
||||
Version: 5.1.0
|
||||
Release: 0
|
||||
Summary: KDE BitTorrent Client
|
||||
License: GPL-2.0+
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/Networking/File-Sharing
|
||||
Url: http://ktorrent.org/
|
||||
URL: http://ktorrent.org/
|
||||
Source0: http://download.kde.org/stable/ktorrent/5.1/%{name}-%{version}.tar.xz
|
||||
Source2: ktorrent.1
|
||||
Source3: ktupnptest.1
|
||||
@ -30,62 +30,66 @@ Source3: ktupnptest.1
|
||||
Patch0: initial-preference.diff
|
||||
# PATCH-FIX-OPENSUSE fix-build-with-qt5.6.patch -- make it build with Qt < 5.7.0 (i.e. on Leap 42.x)
|
||||
Patch1: fix-build-with-qt5.6.patch
|
||||
# PATCH-FIX-UPSTREAM fix-build.patch
|
||||
Patch2: fix-build.patch
|
||||
# PATCH-FIX-UPSTREAM fix-build-with-Qt-5_11.patch
|
||||
Patch3: fix-build-with-Qt-5_11.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libktorrent-devel >= 2.1
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: plasma5-workspace-devel
|
||||
BuildRequires: syndication-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(KF5Archive)
|
||||
BuildRequires: cmake(KF5Completion)
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5ConfigWidgets)
|
||||
BuildRequires: cmake(KF5CoreAddons)
|
||||
BuildRequires: cmake(KF5Crash)
|
||||
BuildRequires: cmake(KF5DBusAddons)
|
||||
BuildRequires: cmake(KF5DNSSD)
|
||||
BuildRequires: cmake(KF5DocTools)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: cmake(KF5IconThemes)
|
||||
BuildRequires: cmake(KF5ItemViews)
|
||||
BuildRequires: cmake(KF5KCMUtils)
|
||||
BuildRequires: cmake(KF5KIO)
|
||||
BuildRequires: cmake(KF5Kross)
|
||||
BuildRequires: cmake(KF5Notifications)
|
||||
BuildRequires: cmake(KF5NotifyConfig)
|
||||
BuildRequires: cmake(KF5Parts)
|
||||
BuildRequires: cmake(KF5Plotting)
|
||||
BuildRequires: cmake(KF5Service)
|
||||
BuildRequires: cmake(KF5Solid)
|
||||
BuildRequires: cmake(KF5TextWidgets)
|
||||
BuildRequires: cmake(KF5WebKit)
|
||||
BuildRequires: cmake(KF5WidgetsAddons)
|
||||
BuildRequires: cmake(KF5WindowSystem)
|
||||
BuildRequires: cmake(KF5XmlGui)
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5DBus)
|
||||
BuildRequires: cmake(Qt5Network)
|
||||
BuildRequires: cmake(Qt5Script)
|
||||
BuildRequires: cmake(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(taglib)
|
||||
Recommends: %{name}-lang = %{version}
|
||||
%if 0%{?suse_version} > 1325
|
||||
BuildRequires: libboost_headers-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: karchive-devel
|
||||
BuildRequires: kcmutils-devel
|
||||
BuildRequires: kcompletion-devel
|
||||
BuildRequires: kconfig-devel
|
||||
BuildRequires: kconfigwidgets-devel
|
||||
BuildRequires: kcoreaddons-devel
|
||||
BuildRequires: kcrash-devel
|
||||
BuildRequires: kdbusaddons-devel
|
||||
BuildRequires: kdewebkit-devel
|
||||
BuildRequires: kdnssd-framework-devel
|
||||
BuildRequires: kdoctools-devel
|
||||
BuildRequires: ki18n-devel
|
||||
BuildRequires: kiconthemes-devel
|
||||
BuildRequires: kio-devel
|
||||
BuildRequires: kitemviews-devel
|
||||
BuildRequires: knotifications-devel
|
||||
BuildRequires: knotifyconfig-devel
|
||||
BuildRequires: kparts-devel
|
||||
BuildRequires: kplotting-devel
|
||||
BuildRequires: kross-devel
|
||||
BuildRequires: kservice-devel
|
||||
BuildRequires: ktextwidgets-devel
|
||||
BuildRequires: kwidgetsaddons-devel
|
||||
BuildRequires: kwindowsystem-devel
|
||||
BuildRequires: kxmlgui-devel
|
||||
BuildRequires: libktorrent-devel >= 2.1
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: plasma5-workspace-devel
|
||||
BuildRequires: solid-devel
|
||||
BuildRequires: syndication-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5DBus)
|
||||
BuildRequires: pkgconfig(Qt5Network)
|
||||
BuildRequires: pkgconfig(Qt5Script)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(taglib)
|
||||
%if 0%{?suse_version} < 1330
|
||||
%if 0%{?sle_version} < 120300
|
||||
BuildRequires: gcc5
|
||||
BuildRequires: gcc5-c++
|
||||
%else
|
||||
BuildRequires: gcc7
|
||||
BuildRequires: gcc7-c++
|
||||
%endif
|
||||
#!BuildIgnore: libgcc_s1
|
||||
%if 0%{?sle_version} < 120300
|
||||
BuildRequires: gcc5
|
||||
BuildRequires: gcc5-c++
|
||||
%else
|
||||
BuildRequires: gcc7
|
||||
BuildRequires: gcc7-c++
|
||||
%endif
|
||||
%endif
|
||||
Recommends: %{name}-lang = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
KTorrent is a BitTorrent application by KDE which allows you to download files
|
||||
@ -94,12 +98,15 @@ same time and comes with extended features to make it a full-featured client
|
||||
for BitTorrent.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%if 0%{?suse_version} < 1330
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} < 1330
|
||||
@ -137,33 +144,31 @@ fi
|
||||
%find_lang %{name}
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING ChangeLog RoadMap
|
||||
%doc %{_mandir}/man1/ktorrent.1%{ext_man}
|
||||
%doc %{_mandir}/man1/ktupnptest.1%{ext_man}
|
||||
%_bindir/ktorrent
|
||||
%_bindir/ktmagnetdownloader
|
||||
%_bindir/ktupnptest
|
||||
%_libdir/libktcore.so.*
|
||||
%_kf5_plugindir/
|
||||
%_kf5_applicationsdir/org.kde.ktorrent.desktop
|
||||
%_kf5_iconsdir/hicolor/*/*/*.png
|
||||
%_kf5_iconsdir/hicolor/*/*/*.svgz
|
||||
%_kf5_notifydir/ktorrent.notifyrc
|
||||
%_kf5_kxmlguidir/ktorrent/
|
||||
%_kf5_htmldir/en/ktorrent/
|
||||
%_kf5_sharedir/ktorrent/
|
||||
%dir %_kf5_appstreamdir
|
||||
%_kf5_appstreamdir/org.kde.ktorrent.appdata.xml
|
||||
%license COPYING
|
||||
%doc ChangeLog RoadMap
|
||||
%dir %{_kf5_appstreamdir}
|
||||
%{_kf5_bindir}/ktmagnetdownloader
|
||||
%{_kf5_bindir}/ktorrent
|
||||
%{_kf5_bindir}/ktupnptest
|
||||
%{_kf5_applicationsdir}/org.kde.ktorrent.desktop
|
||||
%{_kf5_appstreamdir}/org.kde.ktorrent.appdata.xml
|
||||
%{_kf5_htmldir}/en/ktorrent/
|
||||
%{_kf5_iconsdir}/hicolor/*/*/*.png
|
||||
%{_kf5_iconsdir}/hicolor/*/*/*.svgz
|
||||
%{_kf5_kxmlguidir}/ktorrent/
|
||||
%{_kf5_mandir}/man1/ktorrent.1%{?ext_man}
|
||||
%{_kf5_mandir}/man1/ktupnptest.1%{?ext_man}
|
||||
%{_kf5_notifydir}/ktorrent.notifyrc
|
||||
%{_kf5_plugindir}/
|
||||
%{_kf5_sharedir}/ktorrent/
|
||||
%{_libdir}/libktcore.so.*
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%_kf5_htmldir/*/ktorrent/
|
||||
%dir %_kf5_htmldir/pt_BR
|
||||
%exclude %_kf5_htmldir/en/ktorrent/
|
||||
%{_kf5_htmldir}/*/ktorrent/
|
||||
%dir %{_kf5_htmldir}/pt_BR
|
||||
%exclude %{_kf5_htmldir}/en/ktorrent/
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user