SHA256
1
0
forked from pool/ktorrent
OBS User unknown
2009-01-19 01:08:40 +00:00
committed by Git OBS Bridge
parent e880042a1d
commit d73ae5a989
6 changed files with 153 additions and 52 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f99c6bc734a28a687ceb37f68ec49dd22418b6d19a90483898228af8014ccb07
size 2130026

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84048298231274e2d5a3ceec2dcf06822f9080356a2a38d650bf710a3b66979e
size 2670434

View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Jan 17 20:24:22 CET 2009 - coolo@suse.de
- apply trunk.diff to compile with plasma from 4.2
-------------------------------------------------------------------
Mon Jan 12 16:55:33 CET 2009 - dmueller@suse.de
- update to 3.2 (beta1):
* Kross based scripting plugin
* Syndication plugin supporting RSS and Atom feeds
* Plugin to control the file download order of a multifile torrent
* Redesign of chunk memory management, resulting in a
significant decrease in memory usage
* Plasma applet to monitor torrents on your desktop
* Performance improvements when handling torrents with a lot of
files
* Many smaller features
-------------------------------------------------------------------
Fri Nov 28 11:18:48 CET 2008 - wstephenson@suse.de

View File

@@ -1,7 +1,7 @@
#
# spec file for package ktorrent (Version 3.1.5)
# spec file for package ktorrent (Version 3.1.99+3.2beta1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: ktorrent
BuildRequires: gmp-devel kdebase4-workspace-devel libqca2-devel
BuildRequires: gmp-devel kdebase4-workspace-devel libkdepimlibs4-devel libqca2-devel
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@@ -26,15 +26,16 @@ Url: http://ktorrent.pwsp.net/
License: GPL v2 or later
Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client
Version: 3.1.5
Release: 2
Version: 3.1.99+3.2beta1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion %version
%define rversion 3.2beta1
Source: %{name}-%{rversion}.tar.bz2
Source2: icons.tar.bz2
Patch1: remove-links.diff
Patch2: function-address.diff
Patch3: proxy.diff
Patch4: trunk.diff
%if %suse_version > 1020
Requires: %{name}-lang = %{version}
%endif
@@ -75,10 +76,11 @@ Authors:
%lang_package
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %name-%{rversion}
%patch1
%patch2
%patch3
%patch4
tar xfj %{SOURCE2}
%build
@@ -111,19 +113,33 @@ tar xfj %{SOURCE2}
%defattr(-,root,root)
/usr/bin/ktorrent
/usr/bin/ktupnptest
/usr/%_lib/kde4/ktbwschedulerplugin.so
/usr/%_lib/kde4/ktinfowidgetplugin.so
/usr/%_lib/kde4/ktipfilterplugin.so
/usr/%_lib/kde4/ktlogviewerplugin.so
/usr/%_lib/kde4/ktscanfolderplugin.so
/usr/%_lib/kde4/ktsearchplugin.so
/usr/%_lib/kde4/ktstatsplugin.so
/usr/%_lib/kde4/ktupnpplugin.so
/usr/%_lib/kde4/ktwebinterfaceplugin.so
/usr/%_lib/kde4/ktmediaplayerplugin.so
/usr/%_lib/libbtcore.so.*
/usr/%_lib/libktcore.so.*
/usr/%_lib/libktupnp.so.*
%_kde4_modules/ktbwschedulerplugin.so
%_kde4_modules/ktinfowidgetplugin.so
%_kde4_modules/ktipfilterplugin.so
%_kde4_modules/ktlogviewerplugin.so
%_kde4_modules/ktscanfolderplugin.so
%_kde4_modules/ktsearchplugin.so
%_kde4_modules/ktstatsplugin.so
%_kde4_modules/ktupnpplugin.so
%_kde4_modules/ktwebinterfaceplugin.so
%_kde4_modules/ktmediaplayerplugin.so
%_libdir/libbtcore.so.*
%_libdir/libktcore.so.*
%_libdir/libktupnp.so.*
%_kde4_modules/ktdownloadorderplugin.so
%_kde4_modules/ktscriptingplugin.so
%_kde4_modules/ktsyndicationplugin.so
%_kde4_modules/plasma_applet_ktorrent.so
%_kde4_modules/plasma_engine_ktorrent.so
/usr/share/icons/hicolor/*/actions/kt-add-feeds.*
/usr/share/icons/hicolor/*/actions/kt-add-filters.*
/usr/share/icons/hicolor/*/actions/kt-remove-feeds.*
/usr/share/icons/hicolor/*/actions/kt-remove-filters.*
%_kde_share_dir/services/ktdownloadorderplugin.desktop
%_kde_share_dir/services/ktscriptingplugin.desktop
%_kde_share_dir/services/ktsyndicationplugin.desktop
%_kde_share_dir/services/plasma-applet-ktorrent.desktop
%_kde_share_dir/services/plasma-dataengine-ktorrent.desktop
/usr/share/applications/kde4/ktorrent.desktop
/usr/share/icons/hicolor/*/apps/ktorrent.*
/usr/share/icons/hicolor/*/mimetypes/torrent.*
@@ -148,28 +164,41 @@ tar xfj %{SOURCE2}
/usr/share/icons/hicolor/*/actions/kt-stop-all.*
/usr/share/icons/hicolor/*/actions/kt-stop.*
/usr/share/icons/hicolor/*/actions/kt-upnp.*
/usr/share/kde4/apps/cmake/modules/FindBTCore.cmake
/usr/share/kde4/apps/ktorrent
/usr/share/kde4/services/ktbwschedulerplugin.desktop
/usr/share/kde4/services/ktinfowidgetplugin.desktop
/usr/share/kde4/services/ktipfilterplugin.desktop
/usr/share/kde4/services/ktlogviewerplugin.desktop
/usr/share/kde4/services/ktscanfolderplugin.desktop
/usr/share/kde4/services/ktsearchplugin.desktop
/usr/share/kde4/services/ktstatsplugin.desktop
/usr/share/kde4/services/ktupnpplugin.desktop
/usr/share/kde4/services/ktwebinterfaceplugin.desktop
/usr/share/kde4/services/ktmediaplayerplugin.desktop
/usr/share/kde4/servicetypes/ktorrentplugin.desktop
%_kde_share_dir/apps/cmake/modules/FindBTCore.cmake
%_kde_share_dir/apps/ktorrent
%_kde_share_dir/services/ktbwschedulerplugin.desktop
%_kde_share_dir/services/ktinfowidgetplugin.desktop
%_kde_share_dir/services/ktipfilterplugin.desktop
%_kde_share_dir/services/ktlogviewerplugin.desktop
%_kde_share_dir/services/ktscanfolderplugin.desktop
%_kde_share_dir/services/ktsearchplugin.desktop
%_kde_share_dir/services/ktstatsplugin.desktop
%_kde_share_dir/services/ktupnpplugin.desktop
%_kde_share_dir/services/ktwebinterfaceplugin.desktop
%_kde_share_dir/services/ktmediaplayerplugin.desktop
%_kde_share_dir/servicetypes/ktorrentplugin.desktop
%files devel
%defattr(-,root,root)
/usr/%_lib/libbtcore.so
/usr/%_lib/libktcore.so
/usr/%_lib/libktupnp.so
%_libdir/libbtcore.so
%_libdir/libktcore.so
%_libdir/libktupnp.so
/usr/include/libbtcore
%changelog
* Sat Jan 17 2009 coolo@suse.de
- apply trunk.diff to compile with plasma from 4.2
* Mon Jan 12 2009 dmueller@suse.de
- update to 3.2 (beta1):
* Kross based scripting plugin
* Syndication plugin supporting RSS and Atom feeds
* Plugin to control the file download order of a multifile torrent
* Redesign of chunk memory management, resulting in a
significant decrease in memory usage
* Plasma applet to monitor torrents on your desktop
* Performance improvements when handling torrents with a lot of
files
* Many smaller features
* Fri Nov 28 2008 wstephenson@suse.de
- Reinstate geoIP database since license issues resolved
(bnc#188562)

View File

@@ -1,18 +1,17 @@
--- plugins/search/searchenginelist.cpp 2008/04/25 17:25:02 1.1
+++ plugins/search/searchenginelist.cpp 2008/04/25 17:27:28
@@ -32,6 +32,7 @@
{
m_default_list.append(SearchEngine("KTorrents",KUrl("http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0")));
m_default_list.append(SearchEngine("bittorrent.com",KUrl("http://www.bittorrent.com/search_result.myt?search=FOOBAR")));
--- plugins/search/searchenginelist.cpp
+++ plugins/search/searchenginelist.cpp
@@ -41,10 +41,13 @@ namespace kt
default_opensearch_urls << KUrl("http://www.torrentz.com") << KUrl("http://isohunt.com");
default_urls << KUrl("http://www.ktorrents.com")
<< KUrl("http://www.bittorrent.com")
+#if 0
m_default_list.append(SearchEngine("mininova.org",KUrl("http://www.mininova.org/search.php?search=FOOBAR")));
m_default_list.append(SearchEngine("isohunt.com",KUrl("http://isohunt.com/torrents.php?ihq=FOOBAR&op=and")));
m_default_list.append(SearchEngine("thepiratebay.org",KUrl("http://thepiratebay.org/search/FOOBAR")));
@@ -39,6 +40,7 @@
m_default_list.append(SearchEngine("bytenova.org",KUrl("http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8")));
m_default_list.append(SearchEngine("torrentz.com",KUrl("http://www.torrentz.com/search_FOOBAR")));
m_default_list.append(SearchEngine("btjunkie.org",KUrl("http://btjunkie.org/search?q=FOOBAR")));
<< KUrl("http://www.mininova.org")
<< KUrl("http://thepiratebay.org")
<< KUrl("http://www.bitenova.org")
- << KUrl("http://btjunkie.org");
+ << KUrl("http://btjunkie.org")
+#endif
+ ;
}

54
trunk.diff Normal file
View File

@@ -0,0 +1,54 @@
--- CMakeLists.txt (Revision 912562)
+++ CMakeLists.txt (Revision 912562)
@@ -4,9 +4,17 @@
find_package(GMP REQUIRED)
find_package(QCA2 REQUIRED)
find_package(Strigi REQUIRED)
-macro_optional_find_package(Plasma)
-macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for KTorrent Plasmoid")
+# backward compatibility to <= KDE 4.1
+MACRO_ENSURE_VERSION( "4.1.83" ${KDE_VERSION} KDE_VERSION_OK)
+if(NOT KDE_VERSION_OK)
+ macro_optional_find_package(Plasma)
+ macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for KTorrent Plasmoid")
+else(NOT KDE_VERSION_OK)
+ set(PLASMA_FOUND true)
+ set(PLASMA_LIBS ${KDE4_PLASMA_LIBS})
+endif(NOT KDE_VERSION_OK)
+
# set some default settings
include(KDE4Defaults)
--- plasma/applet/CMakeLists.txt (Revision 912562)
+++ plasma/applet/CMakeLists.txt (Revision 912562)
@@ -1,10 +1,20 @@
-set(ktapplet_SRCS applet.cpp chunkbar.cpp)
-
-
-kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+set(TASKMANAGER_FOUND FALSE)
+FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
+FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
-target_link_libraries(plasma_applet_ktorrent ${PLASMA_LIBS} ${KDE4_KIO_LIBS} taskmanager btcore ktcore)
+if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+ set(TASKMANAGER_FOUND TRUE)
+ message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
+ include_directories(${TASKMANAGER_INCLUDE_DIR})
+ set(ktapplet_SRCS applet.cpp chunkbar.cpp)
+
+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+
+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+ target_link_libraries(plasma_applet_ktorrent ${PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} btcore ktcore)
+
+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
-install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
\ No newline at end of file