From f7f78e1e11bf5945359850a3719c12b61e5747c6 Mon Sep 17 00:00:00 2001 From: Jeremy Messenger Date: Thu, 25 Oct 2007 22:37:33 +0000 Subject: Update to 0.5.6. --- net-p2p/deluge/Makefile | 3 +- net-p2p/deluge/distinfo | 6 +- .../deluge/files/patch-libtorrent_src_storage.cpp | 23 ----- net-p2p/deluge/files/patch-setup.py | 38 ++++---- net-p2p/deluge/files/patch-src___init__.py | 32 +++++-- net-p2p/deluge/pkg-plist | 105 +++++++++++++++++---- net-p2p/deluge05/Makefile | 3 +- net-p2p/deluge05/distinfo | 6 +- .../files/patch-libtorrent_src_storage.cpp | 23 ----- net-p2p/deluge05/files/patch-setup.py | 38 ++++---- net-p2p/deluge05/files/patch-src___init__.py | 32 +++++-- net-p2p/deluge05/pkg-plist | 105 +++++++++++++++++---- 12 files changed, 262 insertions(+), 152 deletions(-) delete mode 100644 net-p2p/deluge/files/patch-libtorrent_src_storage.cpp delete mode 100644 net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp (limited to 'net-p2p') diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile index 2fce252313f7..aac656bc0056 100644 --- a/net-p2p/deluge/Makefile +++ b/net-p2p/deluge/Makefile @@ -6,8 +6,7 @@ # PORTNAME= deluge -PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= net-p2p python MASTER_SITES= http://download.deluge-torrent.org/tarball/${PORTVERSION}/ diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo index 5abd78c0b0fe..202024030685 100644 --- a/net-p2p/deluge/distinfo +++ b/net-p2p/deluge/distinfo @@ -1,3 +1,3 @@ -MD5 (deluge-0.5.5.tar.gz) = 76c1f8110aef4131d2bc83a7da957c6a -SHA256 (deluge-0.5.5.tar.gz) = 595bb32865fb369dfa1e18a1476a6708840f16af46f5a4a80019423eb2493a90 -SIZE (deluge-0.5.5.tar.gz) = 1606255 +MD5 (deluge-0.5.6.tar.gz) = c534b0fc6514a2d62d6ea9f5da8e2bcb +SHA256 (deluge-0.5.6.tar.gz) = 665e35893515d249021e8e971942aa3fa2a3df177ca826dd151b06efed2928f5 +SIZE (deluge-0.5.6.tar.gz) = 1736279 diff --git a/net-p2p/deluge/files/patch-libtorrent_src_storage.cpp b/net-p2p/deluge/files/patch-libtorrent_src_storage.cpp deleted file mode 100644 index bcfe5bf7c341..000000000000 --- a/net-p2p/deluge/files/patch-libtorrent_src_storage.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- libtorrent/src/storage.cpp.orig 2007-08-11 01:51:04.000000000 -0500 -+++ libtorrent/src/storage.cpp 2007-08-11 01:52:15.000000000 -0500 -@@ -1027,7 +1027,7 @@ - return false; - #endif - --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - struct statfs buf; - int err = statfs(query_path.native_directory_string().c_str(), &buf); - if (err == 0) -@@ -1060,7 +1060,11 @@ - #endif - - // TODO: POSIX implementation -+#if defined(__FreeBSD__) -+ return true; -+#else - return false; -+#endif - } - - // -- piece_manager ----------------------------------------------------- diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py index 0c60ff16ca96..77c58015ccb6 100644 --- a/net-p2p/deluge/files/patch-setup.py +++ b/net-p2p/deluge/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2007-08-14 11:14:32.000000000 -0500 -+++ setup.py 2007-08-14 11:16:15.000000000 -0500 -@@ -101,13 +101,13 @@ +--- setup.py.orig 2007-10-25 16:49:47.000000000 -0500 ++++ setup.py 2007-10-25 16:51:47.000000000 -0500 +@@ -103,13 +103,13 @@ "-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1", "-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1", "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", @@ -16,28 +16,28 @@ if OS == "linux": if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0: -@@ -150,11 +150,11 @@ - # Ubuntu possible. - if boosttype == "nomt": - librariestype = ['boost_filesystem', 'boost_date_time', +@@ -164,11 +164,11 @@ + if not OS == "win": + if boosttype == "nomt": + librariestype = ['boost_filesystem', 'boost_date_time', - 'boost_thread', 'z', 'pthread', 'ssl'] + 'boost_thread', 'z', 'ssl'] - print 'Libraries nomt' - elif boosttype == "mt": - librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', + print 'Libraries nomt' + elif boosttype == "mt": + librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', - 'boost_thread-mt', 'z', 'pthread', 'ssl'] + 'boost_thread-mt', 'z', 'ssl'] - print 'Libraries mt' - - def fetchCpp(): -@@ -173,8 +173,10 @@ - - deluge_core = Extension('deluge_core', + print 'Libraries mt' + else: + librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', +@@ -189,8 +189,10 @@ + sources.remove('libtorrent/src/file_win.cpp') + deluge_core = Extension('deluge_core', include_dirs = includedirs, + library_dirs = ['%%LOCALBASE%%/lib'], - libraries = librariestype, + libraries = librariestype, extra_compile_args = EXTRA_COMPILE_ARGS, + extra_link_args = ['%%PTHREAD_LIBS%%'], sources = sources) - # Thanks to Iain Nicol for code to save the location for installed prefix - # At runtime, we need to know where we installed the data to. + else: + sources.remove('libtorrent\\src\\file.cpp') diff --git a/net-p2p/deluge/files/patch-src___init__.py b/net-p2p/deluge/files/patch-src___init__.py index 442d86f4263f..b63d5814cebc 100644 --- a/net-p2p/deluge/files/patch-src___init__.py +++ b/net-p2p/deluge/files/patch-src___init__.py @@ -1,15 +1,27 @@ ---- src/__init__.py.orig 2007-08-05 13:08:25.000000000 -0500 -+++ src/__init__.py 2007-08-05 13:08:40.000000000 -0500 -@@ -6,9 +6,9 @@ +--- src/__init__.py.orig 2007-10-25 17:19:53.000000000 -0500 ++++ src/__init__.py 2007-10-25 17:21:29.000000000 -0500 +@@ -37,15 +37,15 @@ APP = 'deluge' - DIR = os.path.join(INSTALL_PREFIX, 'share', 'locale') --locale.setlocale(locale.LC_ALL, '') --locale.bindtextdomain(APP, DIR) --locale.textdomain(APP) -+#locale.setlocale(locale.LC_ALL, '') -+#locale.bindtextdomain(APP, DIR) -+#locale.textdomain(APP) + DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale') +-if not common.windows_check(): +- locale.setlocale(locale.LC_MESSAGES, '') +- locale.bindtextdomain(APP, DIR) +- locale.textdomain(APP) +-else: +- import gtk.glade +- locale.setlocale(locale.LC_ALL, '') +- gtk.glade.bindtextdomain(APP, DIR) +- gtk.glade.textdomain(APP) ++#if not common.windows_check(): ++# locale.setlocale(locale.LC_MESSAGES, '') ++# locale.bindtextdomain(APP, DIR) ++# locale.textdomain(APP) ++#else: ++# import gtk.glade ++# locale.setlocale(locale.LC_ALL, '') ++# gtk.glade.bindtextdomain(APP, DIR) ++# gtk.glade.textdomain(APP) gettext.bindtextdomain(APP, DIR) gettext.textdomain(APP) gettext.install(APP, DIR) diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist index 28528e32bb22..da7fb5224a93 100644 --- a/net-p2p/deluge/pkg-plist +++ b/net-p2p/deluge/pkg-plist @@ -5,9 +5,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/_dbus.py %%PYTHON_SITELIBDIR%%/deluge/_dbus.pyc %%PYTHON_SITELIBDIR%%/deluge/_dbus.pyo -%%PYTHON_SITELIBDIR%%/deluge/browser.py -%%PYTHON_SITELIBDIR%%/deluge/browser.pyc -%%PYTHON_SITELIBDIR%%/deluge/browser.pyo %%PYTHON_SITELIBDIR%%/deluge/common.py %%PYTHON_SITELIBDIR%%/deluge/common.pyc %%PYTHON_SITELIBDIR%%/deluge/common.pyo @@ -27,9 +24,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/files.py %%PYTHON_SITELIBDIR%%/deluge/files.pyc %%PYTHON_SITELIBDIR%%/deluge/files.pyo -%%PYTHON_SITELIBDIR%%/deluge/info.py -%%PYTHON_SITELIBDIR%%/deluge/info.pyc -%%PYTHON_SITELIBDIR%%/deluge/info.pyo %%PYTHON_SITELIBDIR%%/deluge/interface.py %%PYTHON_SITELIBDIR%%/deluge/interface.pyc %%PYTHON_SITELIBDIR%%/deluge/interface.pyo @@ -45,9 +39,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/tab_details.py %%PYTHON_SITELIBDIR%%/deluge/tab_details.pyc %%PYTHON_SITELIBDIR%%/deluge/tab_details.pyo -%%PYTHON_SITELIBDIR%%/deluge/update.py -%%PYTHON_SITELIBDIR%%/deluge/update.pyc -%%PYTHON_SITELIBDIR%%/deluge/update.pyo %%PYTHON_SITELIBDIR%%/deluge/wizard.py %%PYTHON_SITELIBDIR%%/deluge/wizard.pyc %%PYTHON_SITELIBDIR%%/deluge/wizard.pyo @@ -64,12 +55,8 @@ share/applications/deluge.desktop %%DATADIR%%/glade/tray_menu.glade %%DATADIR%%/glade/wizard.glade %%DATADIR%%/pixmaps/deluge-about.png -%%DATADIR%%/pixmaps/deluge128.png -%%DATADIR%%/pixmaps/deluge192.png -%%DATADIR%%/pixmaps/deluge22.png -%%DATADIR%%/pixmaps/deluge256.png -%%DATADIR%%/pixmaps/deluge32.png -%%DATADIR%%/pixmaps/deluge48.png +%%DATADIR%%/pixmaps/deluge.png +%%DATADIR%%/pixmaps/deluge.svg %%DATADIR%%/pixmaps/downloading16.png %%DATADIR%%/pixmaps/flags18x12/ad.png %%DATADIR%%/pixmaps/flags18x12/ae.png @@ -592,6 +579,8 @@ share/applications/deluge.desktop %%DATADIR%%/plugins/NetworkGraph/tab_graph.py %%DATADIR%%/plugins/NetworkHealth/__init__.py %%DATADIR%%/plugins/NetworkHealth/plugin.py +%%DATADIR%%/plugins/Scheduler/__init__.py +%%DATADIR%%/plugins/Scheduler/plugin.py %%DATADIR%%/plugins/SimpleRSS/__init__.py %%DATADIR%%/plugins/SimpleRSS/feedparser.py %%DATADIR%%/plugins/SimpleRSS/plugin.py @@ -608,14 +597,77 @@ share/applications/deluge.desktop %%DATADIR%%/plugins/TorrentPeers/__init__.py %%DATADIR%%/plugins/TorrentPeers/peers_preferences.glade %%DATADIR%%/plugins/TorrentPeers/tab_peers.py -%%DATADIR%%/plugins/TorrentPieces/__init__.py -%%DATADIR%%/plugins/TorrentPieces/pieces_preferences.glade -%%DATADIR%%/plugins/TorrentPieces/tab_pieces.py %%DATADIR%%/plugins/TorrentSearch/__init__.py %%DATADIR%%/plugins/TorrentSearch/plugin.py %%DATADIR%%/plugins/TorrentSearch/searchdlg.glade %%DATADIR%%/plugins/WebSeed/__init__.py %%DATADIR%%/plugins/WebSeed/webseed.glade +%%DATADIR%%/plugins/WebUi/LICENSE +%%DATADIR%%/plugins/WebUi/__init__.py +%%DATADIR%%/plugins/WebUi/dbus_interface.py +%%DATADIR%%/plugins/WebUi/dbus_pythonize.py +%%DATADIR%%/plugins/WebUi/debugerror.py +%%DATADIR%%/plugins/WebUi/deluge_webserver.py +%%DATADIR%%/plugins/WebUi/gtk_cherrypy_wsgiserver.py +%%DATADIR%%/plugins/WebUi/revno +%%DATADIR%%/plugins/WebUi/run_webserver +%%DATADIR%%/plugins/WebUi/scripts/add_torrents_to_deluge.user.js +%%DATADIR%%/plugins/WebUi/scripts/build_webui_tarball.sh +%%DATADIR%%/plugins/WebUi/scripts/curl-example +%%DATADIR%%/plugins/WebUi/scripts/extract_template_strings.py +%%DATADIR%%/plugins/WebUi/scripts/template_strings.py +%%DATADIR%%/plugins/WebUi/static/images/deluge_icon.gif +%%DATADIR%%/plugins/WebUi/static/images/downloading16.png +%%DATADIR%%/plugins/WebUi/static/images/inactive16.png +%%DATADIR%%/plugins/WebUi/static/images/seeding16.png +%%DATADIR%%/plugins/WebUi/static/images/simple_bg.jpg +%%DATADIR%%/plugins/WebUi/static/images/simple_line.jpg +%%DATADIR%%/plugins/WebUi/static/images/simple_logo.jpg +%%DATADIR%%/plugins/WebUi/static/images/tango/down.png +%%DATADIR%%/plugins/WebUi/static/images/tango/list-add.png +%%DATADIR%%/plugins/WebUi/static/images/tango/list-remove.png +%%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-pause.png +%%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-start.png +%%DATADIR%%/plugins/WebUi/static/images/tango/preferences-system.png +%%DATADIR%%/plugins/WebUi/static/images/tango/process-stop.png +%%DATADIR%%/plugins/WebUi/static/images/tango/up.png +%%DATADIR%%/plugins/WebUi/static/images/tango/user-trash.png +%%DATADIR%%/plugins/WebUi/static/images/tango/view-refresh.png +%%DATADIR%%/plugins/WebUi/static/simple_site_style.css +%%DATADIR%%/plugins/WebUi/templates/deluge/about.html +%%DATADIR%%/plugins/WebUi/templates/deluge/authors.txt +%%DATADIR%%/plugins/WebUi/templates/deluge/error.html +%%DATADIR%%/plugins/WebUi/templates/deluge/footer.html +%%DATADIR%%/plugins/WebUi/templates/deluge/header.html +%%DATADIR%%/plugins/WebUi/templates/deluge/index.html +%%DATADIR%%/plugins/WebUi/templates/deluge/login.html +%%DATADIR%%/plugins/WebUi/templates/deluge/part_button.html +%%DATADIR%%/plugins/WebUi/templates/deluge/part_refresh.html +%%DATADIR%%/plugins/WebUi/templates/deluge/refresh_form.html +%%DATADIR%%/plugins/WebUi/templates/deluge/sort_column_head.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_add.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_delete.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_info.html +%%DATADIR%%/plugins/WebUi/templates/hacking-templates.txt +%%DATADIR%%/plugins/WebUi/version +%%DATADIR%%/plugins/WebUi/webpy022/Dependency-not-really part of webui.txt +%%DATADIR%%/plugins/WebUi/webpy022/__init__.py +%%DATADIR%%/plugins/WebUi/webpy022/changes.txt +%%DATADIR%%/plugins/WebUi/webpy022/cheetah.py +%%DATADIR%%/plugins/WebUi/webpy022/db.py +%%DATADIR%%/plugins/WebUi/webpy022/debugerror.py +%%DATADIR%%/plugins/WebUi/webpy022/form.py +%%DATADIR%%/plugins/WebUi/webpy022/http.py +%%DATADIR%%/plugins/WebUi/webpy022/httpserver.py +%%DATADIR%%/plugins/WebUi/webpy022/net.py +%%DATADIR%%/plugins/WebUi/webpy022/request.py +%%DATADIR%%/plugins/WebUi/webpy022/template.py +%%DATADIR%%/plugins/WebUi/webpy022/utils.py +%%DATADIR%%/plugins/WebUi/webpy022/webapi.py +%%DATADIR%%/plugins/WebUi/webpy022/wsgi.py +%%DATADIR%%/plugins/WebUi/webpy022/wsgiserver/__init__.py +%%DATADIR%%/plugins/WebUi/webserver_common.py +%%DATADIR%%/plugins/WebUi/webserver_framework.py %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README share/locale/ar/LC_MESSAGES/deluge.mo @@ -639,6 +691,7 @@ share/locale/he/LC_MESSAGES/deluge.mo share/locale/hr/LC_MESSAGES/deluge.mo share/locale/hu/LC_MESSAGES/deluge.mo share/locale/id/LC_MESSAGES/deluge.mo +share/locale/is/LC_MESSAGES/deluge.mo share/locale/it/LC_MESSAGES/deluge.mo share/locale/ja/LC_MESSAGES/deluge.mo share/locale/ko/LC_MESSAGES/deluge.mo @@ -647,6 +700,7 @@ share/locale/la/LC_MESSAGES/deluge.mo share/locale/lt/LC_MESSAGES/deluge.mo share/locale/lv/LC_MESSAGES/deluge.mo share/locale/mk/LC_MESSAGES/deluge.mo +share/locale/ms/LC_MESSAGES/deluge.mo share/locale/nb/LC_MESSAGES/deluge.mo share/locale/nl/LC_MESSAGES/deluge.mo share/locale/pl/LC_MESSAGES/deluge.mo @@ -674,15 +728,24 @@ share/pixmaps/deluge.png @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/plugins/WebUi/webpy022/wsgiserver +@dirrm %%DATADIR%%/plugins/WebUi/webpy022 +@dirrm %%DATADIR%%/plugins/WebUi/templates/deluge +@dirrm %%DATADIR%%/plugins/WebUi/templates +@dirrm %%DATADIR%%/plugins/WebUi/static/images/tango +@dirrm %%DATADIR%%/plugins/WebUi/static/images +@dirrm %%DATADIR%%/plugins/WebUi/static +@dirrm %%DATADIR%%/plugins/WebUi/scripts +@dirrm %%DATADIR%%/plugins/WebUi @dirrm %%DATADIR%%/plugins/WebSeed @dirrm %%DATADIR%%/plugins/TorrentSearch -@dirrm %%DATADIR%%/plugins/TorrentPieces @dirrm %%DATADIR%%/plugins/TorrentPeers @dirrm %%DATADIR%%/plugins/TorrentNotification @dirrm %%DATADIR%%/plugins/TorrentFiles @dirrm %%DATADIR%%/plugins/TorrentCreator @dirrm %%DATADIR%%/plugins/SpeedLimiter @dirrm %%DATADIR%%/plugins/SimpleRSS +@dirrm %%DATADIR%%/plugins/Scheduler @dirrm %%DATADIR%%/plugins/NetworkHealth @dirrm %%DATADIR%%/plugins/NetworkGraph @dirrm %%DATADIR%%/plugins/MoveTorrent @@ -695,6 +758,10 @@ share/pixmaps/deluge.png @dirrm %%DATADIR%%/pixmaps/flags25x15 @dirrm %%DATADIR%%/pixmaps/flags18x12 @dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/icons/scalable/apps +@dirrm %%DATADIR%%/icons/scalable +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/glade @dirrmtry %%DATADIR%% @dirrmtry share/applications diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile index 2fce252313f7..aac656bc0056 100644 --- a/net-p2p/deluge05/Makefile +++ b/net-p2p/deluge05/Makefile @@ -6,8 +6,7 @@ # PORTNAME= deluge -PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= net-p2p python MASTER_SITES= http://download.deluge-torrent.org/tarball/${PORTVERSION}/ diff --git a/net-p2p/deluge05/distinfo b/net-p2p/deluge05/distinfo index 5abd78c0b0fe..202024030685 100644 --- a/net-p2p/deluge05/distinfo +++ b/net-p2p/deluge05/distinfo @@ -1,3 +1,3 @@ -MD5 (deluge-0.5.5.tar.gz) = 76c1f8110aef4131d2bc83a7da957c6a -SHA256 (deluge-0.5.5.tar.gz) = 595bb32865fb369dfa1e18a1476a6708840f16af46f5a4a80019423eb2493a90 -SIZE (deluge-0.5.5.tar.gz) = 1606255 +MD5 (deluge-0.5.6.tar.gz) = c534b0fc6514a2d62d6ea9f5da8e2bcb +SHA256 (deluge-0.5.6.tar.gz) = 665e35893515d249021e8e971942aa3fa2a3df177ca826dd151b06efed2928f5 +SIZE (deluge-0.5.6.tar.gz) = 1736279 diff --git a/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp b/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp deleted file mode 100644 index bcfe5bf7c341..000000000000 --- a/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- libtorrent/src/storage.cpp.orig 2007-08-11 01:51:04.000000000 -0500 -+++ libtorrent/src/storage.cpp 2007-08-11 01:52:15.000000000 -0500 -@@ -1027,7 +1027,7 @@ - return false; - #endif - --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - struct statfs buf; - int err = statfs(query_path.native_directory_string().c_str(), &buf); - if (err == 0) -@@ -1060,7 +1060,11 @@ - #endif - - // TODO: POSIX implementation -+#if defined(__FreeBSD__) -+ return true; -+#else - return false; -+#endif - } - - // -- piece_manager ----------------------------------------------------- diff --git a/net-p2p/deluge05/files/patch-setup.py b/net-p2p/deluge05/files/patch-setup.py index 0c60ff16ca96..77c58015ccb6 100644 --- a/net-p2p/deluge05/files/patch-setup.py +++ b/net-p2p/deluge05/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2007-08-14 11:14:32.000000000 -0500 -+++ setup.py 2007-08-14 11:16:15.000000000 -0500 -@@ -101,13 +101,13 @@ +--- setup.py.orig 2007-10-25 16:49:47.000000000 -0500 ++++ setup.py 2007-10-25 16:51:47.000000000 -0500 +@@ -103,13 +103,13 @@ "-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1", "-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1", "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", @@ -16,28 +16,28 @@ if OS == "linux": if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0: -@@ -150,11 +150,11 @@ - # Ubuntu possible. - if boosttype == "nomt": - librariestype = ['boost_filesystem', 'boost_date_time', +@@ -164,11 +164,11 @@ + if not OS == "win": + if boosttype == "nomt": + librariestype = ['boost_filesystem', 'boost_date_time', - 'boost_thread', 'z', 'pthread', 'ssl'] + 'boost_thread', 'z', 'ssl'] - print 'Libraries nomt' - elif boosttype == "mt": - librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', + print 'Libraries nomt' + elif boosttype == "mt": + librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', - 'boost_thread-mt', 'z', 'pthread', 'ssl'] + 'boost_thread-mt', 'z', 'ssl'] - print 'Libraries mt' - - def fetchCpp(): -@@ -173,8 +173,10 @@ - - deluge_core = Extension('deluge_core', + print 'Libraries mt' + else: + librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', +@@ -189,8 +189,10 @@ + sources.remove('libtorrent/src/file_win.cpp') + deluge_core = Extension('deluge_core', include_dirs = includedirs, + library_dirs = ['%%LOCALBASE%%/lib'], - libraries = librariestype, + libraries = librariestype, extra_compile_args = EXTRA_COMPILE_ARGS, + extra_link_args = ['%%PTHREAD_LIBS%%'], sources = sources) - # Thanks to Iain Nicol for code to save the location for installed prefix - # At runtime, we need to know where we installed the data to. + else: + sources.remove('libtorrent\\src\\file.cpp') diff --git a/net-p2p/deluge05/files/patch-src___init__.py b/net-p2p/deluge05/files/patch-src___init__.py index 442d86f4263f..b63d5814cebc 100644 --- a/net-p2p/deluge05/files/patch-src___init__.py +++ b/net-p2p/deluge05/files/patch-src___init__.py @@ -1,15 +1,27 @@ ---- src/__init__.py.orig 2007-08-05 13:08:25.000000000 -0500 -+++ src/__init__.py 2007-08-05 13:08:40.000000000 -0500 -@@ -6,9 +6,9 @@ +--- src/__init__.py.orig 2007-10-25 17:19:53.000000000 -0500 ++++ src/__init__.py 2007-10-25 17:21:29.000000000 -0500 +@@ -37,15 +37,15 @@ APP = 'deluge' - DIR = os.path.join(INSTALL_PREFIX, 'share', 'locale') --locale.setlocale(locale.LC_ALL, '') --locale.bindtextdomain(APP, DIR) --locale.textdomain(APP) -+#locale.setlocale(locale.LC_ALL, '') -+#locale.bindtextdomain(APP, DIR) -+#locale.textdomain(APP) + DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale') +-if not common.windows_check(): +- locale.setlocale(locale.LC_MESSAGES, '') +- locale.bindtextdomain(APP, DIR) +- locale.textdomain(APP) +-else: +- import gtk.glade +- locale.setlocale(locale.LC_ALL, '') +- gtk.glade.bindtextdomain(APP, DIR) +- gtk.glade.textdomain(APP) ++#if not common.windows_check(): ++# locale.setlocale(locale.LC_MESSAGES, '') ++# locale.bindtextdomain(APP, DIR) ++# locale.textdomain(APP) ++#else: ++# import gtk.glade ++# locale.setlocale(locale.LC_ALL, '') ++# gtk.glade.bindtextdomain(APP, DIR) ++# gtk.glade.textdomain(APP) gettext.bindtextdomain(APP, DIR) gettext.textdomain(APP) gettext.install(APP, DIR) diff --git a/net-p2p/deluge05/pkg-plist b/net-p2p/deluge05/pkg-plist index 28528e32bb22..da7fb5224a93 100644 --- a/net-p2p/deluge05/pkg-plist +++ b/net-p2p/deluge05/pkg-plist @@ -5,9 +5,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/_dbus.py %%PYTHON_SITELIBDIR%%/deluge/_dbus.pyc %%PYTHON_SITELIBDIR%%/deluge/_dbus.pyo -%%PYTHON_SITELIBDIR%%/deluge/browser.py -%%PYTHON_SITELIBDIR%%/deluge/browser.pyc -%%PYTHON_SITELIBDIR%%/deluge/browser.pyo %%PYTHON_SITELIBDIR%%/deluge/common.py %%PYTHON_SITELIBDIR%%/deluge/common.pyc %%PYTHON_SITELIBDIR%%/deluge/common.pyo @@ -27,9 +24,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/files.py %%PYTHON_SITELIBDIR%%/deluge/files.pyc %%PYTHON_SITELIBDIR%%/deluge/files.pyo -%%PYTHON_SITELIBDIR%%/deluge/info.py -%%PYTHON_SITELIBDIR%%/deluge/info.pyc -%%PYTHON_SITELIBDIR%%/deluge/info.pyo %%PYTHON_SITELIBDIR%%/deluge/interface.py %%PYTHON_SITELIBDIR%%/deluge/interface.pyc %%PYTHON_SITELIBDIR%%/deluge/interface.pyo @@ -45,9 +39,6 @@ bin/deluge %%PYTHON_SITELIBDIR%%/deluge/tab_details.py %%PYTHON_SITELIBDIR%%/deluge/tab_details.pyc %%PYTHON_SITELIBDIR%%/deluge/tab_details.pyo -%%PYTHON_SITELIBDIR%%/deluge/update.py -%%PYTHON_SITELIBDIR%%/deluge/update.pyc -%%PYTHON_SITELIBDIR%%/deluge/update.pyo %%PYTHON_SITELIBDIR%%/deluge/wizard.py %%PYTHON_SITELIBDIR%%/deluge/wizard.pyc %%PYTHON_SITELIBDIR%%/deluge/wizard.pyo @@ -64,12 +55,8 @@ share/applications/deluge.desktop %%DATADIR%%/glade/tray_menu.glade %%DATADIR%%/glade/wizard.glade %%DATADIR%%/pixmaps/deluge-about.png -%%DATADIR%%/pixmaps/deluge128.png -%%DATADIR%%/pixmaps/deluge192.png -%%DATADIR%%/pixmaps/deluge22.png -%%DATADIR%%/pixmaps/deluge256.png -%%DATADIR%%/pixmaps/deluge32.png -%%DATADIR%%/pixmaps/deluge48.png +%%DATADIR%%/pixmaps/deluge.png +%%DATADIR%%/pixmaps/deluge.svg %%DATADIR%%/pixmaps/downloading16.png %%DATADIR%%/pixmaps/flags18x12/ad.png %%DATADIR%%/pixmaps/flags18x12/ae.png @@ -592,6 +579,8 @@ share/applications/deluge.desktop %%DATADIR%%/plugins/NetworkGraph/tab_graph.py %%DATADIR%%/plugins/NetworkHealth/__init__.py %%DATADIR%%/plugins/NetworkHealth/plugin.py +%%DATADIR%%/plugins/Scheduler/__init__.py +%%DATADIR%%/plugins/Scheduler/plugin.py %%DATADIR%%/plugins/SimpleRSS/__init__.py %%DATADIR%%/plugins/SimpleRSS/feedparser.py %%DATADIR%%/plugins/SimpleRSS/plugin.py @@ -608,14 +597,77 @@ share/applications/deluge.desktop %%DATADIR%%/plugins/TorrentPeers/__init__.py %%DATADIR%%/plugins/TorrentPeers/peers_preferences.glade %%DATADIR%%/plugins/TorrentPeers/tab_peers.py -%%DATADIR%%/plugins/TorrentPieces/__init__.py -%%DATADIR%%/plugins/TorrentPieces/pieces_preferences.glade -%%DATADIR%%/plugins/TorrentPieces/tab_pieces.py %%DATADIR%%/plugins/TorrentSearch/__init__.py %%DATADIR%%/plugins/TorrentSearch/plugin.py %%DATADIR%%/plugins/TorrentSearch/searchdlg.glade %%DATADIR%%/plugins/WebSeed/__init__.py %%DATADIR%%/plugins/WebSeed/webseed.glade +%%DATADIR%%/plugins/WebUi/LICENSE +%%DATADIR%%/plugins/WebUi/__init__.py +%%DATADIR%%/plugins/WebUi/dbus_interface.py +%%DATADIR%%/plugins/WebUi/dbus_pythonize.py +%%DATADIR%%/plugins/WebUi/debugerror.py +%%DATADIR%%/plugins/WebUi/deluge_webserver.py +%%DATADIR%%/plugins/WebUi/gtk_cherrypy_wsgiserver.py +%%DATADIR%%/plugins/WebUi/revno +%%DATADIR%%/plugins/WebUi/run_webserver +%%DATADIR%%/plugins/WebUi/scripts/add_torrents_to_deluge.user.js +%%DATADIR%%/plugins/WebUi/scripts/build_webui_tarball.sh +%%DATADIR%%/plugins/WebUi/scripts/curl-example +%%DATADIR%%/plugins/WebUi/scripts/extract_template_strings.py +%%DATADIR%%/plugins/WebUi/scripts/template_strings.py +%%DATADIR%%/plugins/WebUi/static/images/deluge_icon.gif +%%DATADIR%%/plugins/WebUi/static/images/downloading16.png +%%DATADIR%%/plugins/WebUi/static/images/inactive16.png +%%DATADIR%%/plugins/WebUi/static/images/seeding16.png +%%DATADIR%%/plugins/WebUi/static/images/simple_bg.jpg +%%DATADIR%%/plugins/WebUi/static/images/simple_line.jpg +%%DATADIR%%/plugins/WebUi/static/images/simple_logo.jpg +%%DATADIR%%/plugins/WebUi/static/images/tango/down.png +%%DATADIR%%/plugins/WebUi/static/images/tango/list-add.png +%%DATADIR%%/plugins/WebUi/static/images/tango/list-remove.png +%%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-pause.png +%%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-start.png +%%DATADIR%%/plugins/WebUi/static/images/tango/preferences-system.png +%%DATADIR%%/plugins/WebUi/static/images/tango/process-stop.png +%%DATADIR%%/plugins/WebUi/static/images/tango/up.png +%%DATADIR%%/plugins/WebUi/static/images/tango/user-trash.png +%%DATADIR%%/plugins/WebUi/static/images/tango/view-refresh.png +%%DATADIR%%/plugins/WebUi/static/simple_site_style.css +%%DATADIR%%/plugins/WebUi/templates/deluge/about.html +%%DATADIR%%/plugins/WebUi/templates/deluge/authors.txt +%%DATADIR%%/plugins/WebUi/templates/deluge/error.html +%%DATADIR%%/plugins/WebUi/templates/deluge/footer.html +%%DATADIR%%/plugins/WebUi/templates/deluge/header.html +%%DATADIR%%/plugins/WebUi/templates/deluge/index.html +%%DATADIR%%/plugins/WebUi/templates/deluge/login.html +%%DATADIR%%/plugins/WebUi/templates/deluge/part_button.html +%%DATADIR%%/plugins/WebUi/templates/deluge/part_refresh.html +%%DATADIR%%/plugins/WebUi/templates/deluge/refresh_form.html +%%DATADIR%%/plugins/WebUi/templates/deluge/sort_column_head.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_add.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_delete.html +%%DATADIR%%/plugins/WebUi/templates/deluge/torrent_info.html +%%DATADIR%%/plugins/WebUi/templates/hacking-templates.txt +%%DATADIR%%/plugins/WebUi/version +%%DATADIR%%/plugins/WebUi/webpy022/Dependency-not-really part of webui.txt +%%DATADIR%%/plugins/WebUi/webpy022/__init__.py +%%DATADIR%%/plugins/WebUi/webpy022/changes.txt +%%DATADIR%%/plugins/WebUi/webpy022/cheetah.py +%%DATADIR%%/plugins/WebUi/webpy022/db.py +%%DATADIR%%/plugins/WebUi/webpy022/debugerror.py +%%DATADIR%%/plugins/WebUi/webpy022/form.py +%%DATADIR%%/plugins/WebUi/webpy022/http.py +%%DATADIR%%/plugins/WebUi/webpy022/httpserver.py +%%DATADIR%%/plugins/WebUi/webpy022/net.py +%%DATADIR%%/plugins/WebUi/webpy022/request.py +%%DATADIR%%/plugins/WebUi/webpy022/template.py +%%DATADIR%%/plugins/WebUi/webpy022/utils.py +%%DATADIR%%/plugins/WebUi/webpy022/webapi.py +%%DATADIR%%/plugins/WebUi/webpy022/wsgi.py +%%DATADIR%%/plugins/WebUi/webpy022/wsgiserver/__init__.py +%%DATADIR%%/plugins/WebUi/webserver_common.py +%%DATADIR%%/plugins/WebUi/webserver_framework.py %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README share/locale/ar/LC_MESSAGES/deluge.mo @@ -639,6 +691,7 @@ share/locale/he/LC_MESSAGES/deluge.mo share/locale/hr/LC_MESSAGES/deluge.mo share/locale/hu/LC_MESSAGES/deluge.mo share/locale/id/LC_MESSAGES/deluge.mo +share/locale/is/LC_MESSAGES/deluge.mo share/locale/it/LC_MESSAGES/deluge.mo share/locale/ja/LC_MESSAGES/deluge.mo share/locale/ko/LC_MESSAGES/deluge.mo @@ -647,6 +700,7 @@ share/locale/la/LC_MESSAGES/deluge.mo share/locale/lt/LC_MESSAGES/deluge.mo share/locale/lv/LC_MESSAGES/deluge.mo share/locale/mk/LC_MESSAGES/deluge.mo +share/locale/ms/LC_MESSAGES/deluge.mo share/locale/nb/LC_MESSAGES/deluge.mo share/locale/nl/LC_MESSAGES/deluge.mo share/locale/pl/LC_MESSAGES/deluge.mo @@ -674,15 +728,24 @@ share/pixmaps/deluge.png @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/plugins/WebUi/webpy022/wsgiserver +@dirrm %%DATADIR%%/plugins/WebUi/webpy022 +@dirrm %%DATADIR%%/plugins/WebUi/templates/deluge +@dirrm %%DATADIR%%/plugins/WebUi/templates +@dirrm %%DATADIR%%/plugins/WebUi/static/images/tango +@dirrm %%DATADIR%%/plugins/WebUi/static/images +@dirrm %%DATADIR%%/plugins/WebUi/static +@dirrm %%DATADIR%%/plugins/WebUi/scripts +@dirrm %%DATADIR%%/plugins/WebUi @dirrm %%DATADIR%%/plugins/WebSeed @dirrm %%DATADIR%%/plugins/TorrentSearch -@dirrm %%DATADIR%%/plugins/TorrentPieces @dirrm %%DATADIR%%/plugins/TorrentPeers @dirrm %%DATADIR%%/plugins/TorrentNotification @dirrm %%DATADIR%%/plugins/TorrentFiles @dirrm %%DATADIR%%/plugins/TorrentCreator @dirrm %%DATADIR%%/plugins/SpeedLimiter @dirrm %%DATADIR%%/plugins/SimpleRSS +@dirrm %%DATADIR%%/plugins/Scheduler @dirrm %%DATADIR%%/plugins/NetworkHealth @dirrm %%DATADIR%%/plugins/NetworkGraph @dirrm %%DATADIR%%/plugins/MoveTorrent @@ -695,6 +758,10 @@ share/pixmaps/deluge.png @dirrm %%DATADIR%%/pixmaps/flags25x15 @dirrm %%DATADIR%%/pixmaps/flags18x12 @dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/icons/scalable/apps +@dirrm %%DATADIR%%/icons/scalable +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/glade @dirrmtry %%DATADIR%% @dirrmtry share/applications -- cgit v1.2.3