forked from pool/ktorrent
Accepting request 25026 from KDE:KDE4:Factory:Desktop
Copy from KDE:KDE4:Factory:Desktop/ktorrent based on submit request 25026 from user wstephenson OBS-URL: https://build.opensuse.org/request/show/25026 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=50
This commit is contained in:
committed by
Git OBS Bridge
parent
f6f07fa426
commit
2855c2783d
3
ktorrent-3.3.1.tar.bz2
Normal file
3
ktorrent-3.3.1.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2127dac10b89db412ca3ec478d0cf7d1e043d43329bcb1700955c71e57c29e95
|
||||||
|
size 2750435
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dab849622d1d6c69edade774886589e37f6feb1f845e8f70fe66b91721036687
|
|
||||||
size 2745995
|
|
@@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 25 09:16:18 UTC 2009 - wstephenson@novell.com
|
||||||
|
|
||||||
|
- Re-enable DHT following legal advice, with warning popup
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 25 08:33:35 UTC 2009 - beineri@opensuse.org
|
||||||
|
|
||||||
|
- update to 3.3.1: several crash and memory leaks fixes. Bandwidth
|
||||||
|
schedulers user interaction has been improved, and some other
|
||||||
|
minor issues have also been fixed.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 11 23:38:30 UTC 2009 - tittiatcoke@gmail.com
|
Wed Nov 11 23:38:30 UTC 2009 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ktorrent (Version 3.3)
|
# spec file for package ktorrent (Version 3.3.1)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@@ -26,7 +26,7 @@ Url: http://ktorrent.pwsp.net/
|
|||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: Productivity/Networking/File-Sharing
|
Group: Productivity/Networking/File-Sharing
|
||||||
Summary: KDE BitTorrent Client
|
Summary: KDE BitTorrent Client
|
||||||
Version: 3.3
|
Version: 3.3.1
|
||||||
Release: 1
|
Release: 1
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%define rversion %version
|
%define rversion %version
|
||||||
@@ -34,9 +34,8 @@ Source: %{name}-%{rversion}.tar.bz2
|
|||||||
Source2: icons.tar.bz2
|
Source2: icons.tar.bz2
|
||||||
Patch1: remove-links.diff
|
Patch1: remove-links.diff
|
||||||
Patch3: proxy.diff
|
Patch3: proxy.diff
|
||||||
%if %suse_version > 1020
|
Patch4: suse-dht-warning.diff
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
%endif
|
|
||||||
%kde4_runtime_requires
|
%kde4_runtime_requires
|
||||||
Requires: oxygen-icon-theme
|
Requires: oxygen-icon-theme
|
||||||
|
|
||||||
@@ -77,10 +76,13 @@ Authors:
|
|||||||
%setup -q -n %name-%{rversion}
|
%setup -q -n %name-%{rversion}
|
||||||
%patch1
|
%patch1
|
||||||
%patch3
|
%patch3
|
||||||
|
%if ! 0%{?packman_bs}
|
||||||
|
%patch4
|
||||||
|
%endif
|
||||||
tar xfj %{SOURCE2}
|
tar xfj %{SOURCE2}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=false
|
%cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=true
|
||||||
%make_jobs
|
%make_jobs
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
72
suse-dht-warning.diff
Normal file
72
suse-dht-warning.diff
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
Index: ktorrent/gui.cpp
|
||||||
|
===================================================================
|
||||||
|
--- ktorrent/gui.cpp (revision 1053967)
|
||||||
|
+++ ktorrent/gui.cpp (working copy)
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
#include <kpushbutton.h>
|
||||||
|
#include <kxmlguifactory.h>
|
||||||
|
#include <KNotifyConfigWidget>
|
||||||
|
+#include <KTipDialog>
|
||||||
|
#include <kio/jobclasses.h>
|
||||||
|
#include <kio/jobuidelegate.h>
|
||||||
|
|
||||||
|
@@ -115,6 +116,8 @@
|
||||||
|
//markk.update();
|
||||||
|
updateActions();
|
||||||
|
core->startUpdateTimer();
|
||||||
|
+
|
||||||
|
+ QTimer::singleShot(0, this, SLOT(showDhtTip()));
|
||||||
|
}
|
||||||
|
|
||||||
|
GUI:: ~GUI()
|
||||||
|
@@ -601,6 +604,11 @@
|
||||||
|
{
|
||||||
|
return torrent_activity;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ void GUI::showDhtTip()
|
||||||
|
+ {
|
||||||
|
+ KTipDialog::showTip(this, "ktorrent/dhttip");
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
#include "gui.moc"
|
||||||
|
Index: ktorrent/dhttip
|
||||||
|
===================================================================
|
||||||
|
--- ktorrent/dhttip (revision 0)
|
||||||
|
+++ ktorrent/dhttip (revision 0)
|
||||||
|
@@ -0,0 +1,11 @@
|
||||||
|
+<tip category="Ktorrent">
|
||||||
|
+<html>
|
||||||
|
+<p>
|
||||||
|
+Please respect the rights of copyright holders.
|
||||||
|
+</p>
|
||||||
|
+<p>
|
||||||
|
+Free Software also depends upon the principle of copyright.
|
||||||
|
+</p>
|
||||||
|
+</html>
|
||||||
|
+</tip>
|
||||||
|
+
|
||||||
|
Index: ktorrent/gui.h
|
||||||
|
===================================================================
|
||||||
|
--- ktorrent/gui.h (revision 1053967)
|
||||||
|
+++ ktorrent/gui.h (working copy)
|
||||||
|
@@ -121,6 +121,7 @@
|
||||||
|
void applySettings();
|
||||||
|
void showOrHide();
|
||||||
|
void configureNotifications();
|
||||||
|
+ void showDhtTip();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void setupActions();
|
||||||
|
Index: ktorrent/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- ktorrent/CMakeLists.txt (revision 1053967)
|
||||||
|
+++ ktorrent/CMakeLists.txt (working copy)
|
||||||
|
@@ -78,5 +78,6 @@
|
||||||
|
install(FILES ktorrentplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||||
|
install(FILES ktorrentui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
|
||||||
|
install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
|
||||||
|
+install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent)
|
||||||
|
|
||||||
|
add_subdirectory(icons)
|
Reference in New Issue
Block a user