diff -urN /usr/ports/net-p2p/deluge/Makefile net-p2p/deluge/Makefile --- /usr/ports/net-p2p/deluge/Makefile 2009-04-08 02:23:04.000000000 +0900 +++ net-p2p/deluge/Makefile 2009-05-28 03:15:57.000000000 +0900 @@ -6,9 +6,9 @@ # PORTNAME= deluge -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.8 CATEGORIES= net-p2p python -MASTER_SITES= http://ftp.osuosl.org/pub/deluge/source/ +MASTER_SITES= http://download.deluge-torrent.org/source/ MAINTAINER= ports@FreeBSD.org COMMENT= A Bittorrent client, using Python, GTK+2 and Rasterbar libtorrent @@ -25,12 +25,12 @@ USE_OPENSSL= yes USE_PYTHON= yes USE_GCC= 4.3+ +MAKE_ENV= PYTHONPATH="${PYTHONPREFIX_SITELIBDIR}" -MAKE_ENV+= PYTHONPATH=${PYTHONPREFIX_SITELIBDIR} - -DOCS= ChangeLog LICENSE README MAN1= deluge.1 deluged.1 +PLIST_SUB= VERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}" + .if !defined(WITHOUT_PYGTK) RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ @@ -73,9 +73,9 @@ .if !defined(WITHOUT_PYGTK) @-update-desktop-database .endif -.ifndef (NOPORTDOCS) +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for i in ${DOCS} +.for i in ChangeLog LICENSE README @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif diff -urN /usr/ports/net-p2p/deluge/distinfo net-p2p/deluge/distinfo --- /usr/ports/net-p2p/deluge/distinfo 2009-03-19 15:23:27.000000000 +0900 +++ net-p2p/deluge/distinfo 2009-05-28 03:15:57.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (deluge-1.1.5.tar.bz2) = 027fec63e189a39939df6777c0426814 -SHA256 (deluge-1.1.5.tar.bz2) = 8eee6286f8a73461d76062cba5792b3825f5e3a6d5edf7819dbdf5ced7816a9b -SIZE (deluge-1.1.5.tar.bz2) = 2159521 +MD5 (deluge-1.1.8.tar.bz2) = 191a5b14fe8e63e99bc934669a0b3aa7 +SHA256 (deluge-1.1.8.tar.bz2) = d201fc2fb3fa4547d50bd3c461e07de8b215bb7c161d3458a2ed0824a5c1b742 +SIZE (deluge-1.1.8.tar.bz2) = 2145717 diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py --- /usr/ports/net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py 1970-01-01 09:00:00.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py 2009-05-28 03:15:57.000000000 +0900 @@ -0,0 +1,40 @@ +--- deluge/core/preferencesmanager.py.orig 2009-05-16 03:09:59.000000000 +0900 ++++ deluge/core/preferencesmanager.py 2009-05-28 02:24:21.000000000 +0900 +@@ -105,7 +105,6 @@ + "auto_managed": True, + "move_completed": False, + "move_completed_path": deluge.common.get_default_download_dir(), +- "new_release_check": True, + "proxies": { + "peer": { + "type": 0, +@@ -215,9 +214,6 @@ + self._on_send_info) + self.config.register_set_function("proxies", + self._on_set_proxies) +- self.new_release_timer = None +- self.config.register_set_function("new_release_check", +- self._on_new_release_check) + self.config.register_set_function("rate_limit_ip_overhead", + self._on_rate_limit_ip_overhead) + +@@ -457,19 +453,6 @@ + if value: + Send_Info_Thread(self.config).start() + +- def _on_new_release_check(self, key, value): +- if value: +- log.debug("Checking for new release..") +- threading.Thread(target=self.core.get_new_release).start() +- if self.new_release_timer: +- gobject.source_remove(self.new_release_timer) +- # Set a timer to check for a new release every 3 days +- self.new_release_timer = gobject.timeout_add( +- 72 * 60 * 60 * 1000, self._on_new_release_check, "new_release_check", True) +- else: +- if self.new_release_timer: +- gobject.source_remove(self.new_release_timer) +- + def _on_set_proxies(self, key, value): + for k, v in value.items(): + if v["type"]: diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade --- /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade 1970-01-01 09:00:00.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade 2009-05-28 03:15:57.000000000 +0900 @@ -0,0 +1,199 @@ +--- deluge/ui/gtkui/glade/main_window.glade.orig 2009-05-16 14:47:35.000000000 +0900 ++++ deluge/ui/gtkui/glade/main_window.glade 2009-05-28 02:25:00.000000000 +0900 +@@ -2403,196 +2403,6 @@ + + + +- +- 5 +- New Release +- GTK_WIN_POS_CENTER_ON_PARENT +- deluge +- GDK_WINDOW_TYPE_HINT_DIALOG +- False +- +- +- True +- 2 +- +- +- True +- 10 +- 5 +- +- +- True +- 5 +- +- +- True +- gtk-missing-image +- +- +- False +- False +- +- +- +- +- True +- <b><big>New Release Available!</big></b> +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- False +- +- +- +- +- True +- +- +- False +- 1 +- +- +- +- +- True +- 5 +- +- +- True +- 2 +- 2 +- 10 +- 2 +- +- +- True +- 0 +- <i>Current Version:</i> +- True +- +- +- GTK_FILL +- +- +- +- +- True +- +- +- 1 +- 2 +- +- +- +- +- +- True +- 0 +- <i>Available Version:</i> +- True +- +- +- 1 +- 2 +- GTK_FILL +- +- +- +- +- True +- +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- +- +- +- 2 +- +- +- +- +- True +- 5 +- +- +- True +- True +- Do not show this dialog in the future +- 0 +- True +- +- +- +- +- 3 +- +- +- +- +- False +- False +- 1 +- +- +- +- +- True +- GTK_BUTTONBOX_END +- +- +- True +- True +- True +- gtk-close +- True +- 0 +- +- +- False +- False +- +- +- +- +- True +- True +- True +- _Goto Website +- True +- 0 +- +- +- +- False +- False +- 1 +- +- +- +- +- False +- False +- GTK_PACK_END +- +- +- +- +- + + True + diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade --- /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade 1970-01-01 09:00:00.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade 2009-05-28 03:15:57.000000000 +0900 @@ -0,0 +1,119 @@ +--- deluge/ui/gtkui/glade/preferences_dialog.glade.orig 2009-03-16 03:38:08.000000000 +0900 ++++ deluge/ui/gtkui/glade/preferences_dialog.glade 2009-05-28 02:38:57.000000000 +0900 +@@ -2070,66 +2070,6 @@ + + + +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- GTK_SHADOW_NONE +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 2 +- 12 +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- +- +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- Deluge will check our servers and will tell you if a newer version has been released +- Be alerted about new releases +- 0 +- True +- +- +- +- +- False +- False +- +- +- +- +- +- +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- <b>Updates</b> +- True +- +- +- label_item +- +- +- +- +- False +- False +- 5 +- 2 +- +- +- + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +@@ -2381,49 +2321,6 @@ + 3 + + +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- GTK_SHADOW_NONE +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 5 +- 10 +- +- +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- Periodically check the website for new releases +- 0 +- True +- +- +- +- +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- <b>Other</b> +- True +- +- +- label_item +- +- +- +- +- False +- False +- 5 +- 4 +- +- + + + diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py --- /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py 1970-01-01 09:00:00.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py 2009-05-28 03:15:57.000000000 +0900 @@ -0,0 +1,47 @@ +--- deluge/ui/gtkui/preferences.py.orig 2009-04-07 05:24:02.000000000 +0900 ++++ deluge/ui/gtkui/preferences.py 2009-05-28 02:39:06.000000000 +0900 +@@ -231,7 +231,6 @@ + "chk_natpmp": ("active", self.core_config["natpmp"]), + "chk_utpex": ("active", self.core_config["utpex"]), + "chk_lsd": ("active", self.core_config["lsd"]), +- "chk_new_releases": ("active", self.core_config["new_release_check"]), + "chk_send_info": ("active", self.core_config["send_info"]), + "combo_encin": ("active", self.core_config["enc_in_policy"]), + "combo_encout": ("active", self.core_config["enc_out_policy"]), +@@ -372,7 +371,6 @@ + "chk_utpex", + "chk_lsd", + "chk_send_info", +- "chk_new_releases", + "combo_encin", + "combo_encout", + "combo_enclevel", +@@ -438,10 +436,6 @@ + self.glade.get_widget("chk_show_rate_in_title").set_active( + self.gtkui_config["show_rate_in_title"]) + +- ## Other tab ## +- self.glade.get_widget("chk_show_new_releases").set_active( +- self.gtkui_config["show_new_releases"]) +- + ## Notification tab ## + self.glade.get_widget("chk_ntf_tray_blink").set_active( + self.gtkui_config["ntf_tray_blink"]) +@@ -654,8 +648,6 @@ + new_gtkui_config["ntf_security"] = 'TLS' + + ## Other tab ## +- new_gtkui_config["show_new_releases"] = \ +- self.glade.get_widget("chk_show_new_releases").get_active() + new_core_config["send_info"] = \ + self.glade.get_widget("chk_send_info").get_active() + +@@ -664,8 +656,6 @@ + self.glade.get_widget("spin_daemon_port").get_value_as_int() + new_core_config["allow_remote"] = \ + self.glade.get_widget("chk_allow_remote_connections").get_active() +- new_core_config["new_release_check"] = \ +- self.glade.get_widget("chk_new_releases").get_active() + + ## Proxy tab ## + new_core_config["proxies"] = {} diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py --- /usr/ports/net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py 1970-01-01 09:00:00.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py 2009-05-28 03:15:57.000000000 +0900 @@ -0,0 +1,24 @@ +--- deluge/ui/gtkui/signals.py.orig 2009-04-07 05:24:02.000000000 +0900 ++++ deluge/ui/gtkui/signals.py 2009-05-28 02:39:16.000000000 +0900 +@@ -72,8 +72,6 @@ + self.torrent_queue_changed) + self.receiver.connect_to_signal("torrent_resume_at_stop_ratio", + self.torrent_resume_at_stop_ratio) +- self.receiver.connect_to_signal("new_version_available", +- self.new_version_available) + self.receiver.connect_to_signal("args_from_external", + self.args_from_external) + self.receiver.connect_to_signal("torrent_state_changed", +@@ -152,12 +150,6 @@ + component.get("StatusBar").display_warning( + text=_("Torrent is past stop ratio.")) + +- def new_version_available(self, value): +- log.debug("new_version_available: %s", value) +- if self.config["show_new_releases"]: +- from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog +- NewReleaseDialog().show(value) +- + def args_from_external(self, value): + log.debug("args_from_external: %s", value) + import ipcinterface diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge_core_core.py net-p2p/deluge/files/patch-deluge_core_core.py --- /usr/ports/net-p2p/deluge/files/patch-deluge_core_core.py 2009-01-19 13:18:08.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge_core_core.py 2009-05-28 03:16:31.000000000 +0900 @@ -1,19 +1,76 @@ ---- deluge/core/core.py.orig 2009-01-17 11:31:58.000000000 -0600 -+++ deluge/core/core.py 2009-01-17 11:33:32.000000000 -0600 -@@ -115,11 +115,11 @@ +--- deluge/core/core.py.orig 2009-05-16 03:09:59.000000000 +0900 ++++ deluge/core/core.py 2009-05-28 02:42:12.000000000 +0900 +@@ -232,9 +227,6 @@ + # Start the AuthManager + self.authmanager = AuthManager() - # Initialize gettext - try: -- locale.setlocale(locale.LC_ALL, '') -- if hasattr(locale, "bindtextdomain"): -- locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -- if hasattr(locale, "textdomain"): -- locale.textdomain("deluge") -+# locale.setlocale(locale.LC_ALL, '') -+# if hasattr(locale, "bindtextdomain"): -+# locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -+# if hasattr(locale, "textdomain"): -+# locale.textdomain("deluge") - gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) - gettext.textdomain("deluge") - gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) +- # New release check information +- self.new_release = None +- + component.start("PreferencesManager") + component.start() + +@@ -319,54 +311,6 @@ + except Exception, e: + log.warning("Failed to save dht state: %s", e) + +- def get_new_release(self): +- log.debug("get_new_release") +- from urllib2 import urlopen +- try: +- self.new_release = urlopen( +- "http://download.deluge-torrent.org/version-1.0").read().strip() +- except Exception, e: +- log.debug("Unable to get release info from website: %s", e) +- return +- self.check_new_release() +- +- def check_new_release(self): +- if self.new_release: +- log.debug("new_release: %s", self.new_release) +- class VersionSplit(object): +- def __init__(self, ver): +- ver = ver.lower() +- vs = ver.split("_") if "_" in ver else ver.split("-") +- self.version = vs[0] +- self.suffix = None +- if len(vs) > 1: +- for s in ("rc", "alpha", "beta", "dev"): +- if s in vs[1][:len(s)]: +- self.suffix = vs[1] +- +- def __cmp__(self, ver): +- if self.version > ver.version or (self.suffix and self.suffix[:3] == "dev"): +- return 1 +- if self.version < ver.version: +- return -1 +- +- if self.version == ver.version: +- if self.suffix == ver.suffix: +- return 0 +- if self.suffix is None: +- return 1 +- if ver.suffix is None: +- return -1 +- if self.suffix < ver.suffix: +- return -1 +- if self.suffix > ver.suffix: +- return 1 +- +- if VersionSplit(self.new_release) > VersionSplit(deluge.common.get_version()): +- self.signals.emit("new_version_available", self.new_release) +- return self.new_release +- return False +- + # Exported Methods + def export_ping(self): + """A method to see if the core is running""" +@@ -381,8 +325,6 @@ + """Registers a client with the signal manager so that signals are + sent to it.""" + self.signals.register_client(self.client_address, port) +- if self.config["new_release_check"]: +- self.check_new_release() + + def export_deregister_client(self): + """De-registers a client with the signal manager.""" diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py --- /usr/ports/net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py 2009-02-23 01:28:14.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py 2009-05-28 03:17:23.000000000 +0900 @@ -1,17 +1,18 @@ ---- deluge/ui/gtkui/gtkui.py.orig 2009-02-21 16:50:22.000000000 -0600 -+++ deluge/ui/gtkui/gtkui.py 2009-02-21 16:50:24.000000000 -0600 -@@ -119,10 +119,10 @@ - - # Initialize gettext - try: -- if hasattr(locale, "bindtextdomain"): -- locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -- if hasattr(locale, "textdomain"): -- locale.textdomain("deluge") -+# if hasattr(locale, "bindtextdomain"): -+# locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -+# if hasattr(locale, "textdomain"): -+# locale.textdomain("deluge") - gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) - gettext.textdomain("deluge") - gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) +--- deluge/ui/gtkui/gtkui.py.orig 2009-04-10 01:40:52.000000000 +0900 ++++ deluge/ui/gtkui/gtkui.py 2009-05-27 04:37:04.000000000 +0900 +@@ -81,7 +81,6 @@ + "start_in_tray": False, + "lock_tray": False, + "tray_password": "", +- "check_new_releases": True, + "default_load_path": None, + "window_maximized": False, + "window_x_pos": 0, +@@ -101,7 +100,6 @@ + "autoadd_enable": False, + "autoadd_location": "", + "choose_directory_dialog_path": deluge.common.get_default_download_dir(), +- "show_new_releases": True, + "signal_port": 40000, + "ntf_tray_blink": True, + "ntf_sound": False, diff -urN /usr/ports/net-p2p/deluge/files/patch-deluge_ui_webui_deluge_webserver.py net-p2p/deluge/files/patch-deluge_ui_webui_deluge_webserver.py --- /usr/ports/net-p2p/deluge/files/patch-deluge_ui_webui_deluge_webserver.py 2009-01-19 13:18:08.000000000 +0900 +++ net-p2p/deluge/files/patch-deluge_ui_webui_deluge_webserver.py 1970-01-01 09:00:00.000000000 +0900 @@ -1,19 +0,0 @@ ---- deluge/ui/webui/deluge_webserver.py.orig 2009-01-17 11:35:46.000000000 -0600 -+++ deluge/ui/webui/deluge_webserver.py 2009-01-17 11:35:59.000000000 -0600 -@@ -35,11 +35,11 @@ - - # Initialize gettext - try: -- locale.setlocale(locale.LC_ALL, '') -- if hasattr(locale, "bindtextdomain"): -- locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -- if hasattr(locale, "textdomain"): -- locale.textdomain("deluge") -+# locale.setlocale(locale.LC_ALL, '') -+# if hasattr(locale, "bindtextdomain"): -+# locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) -+# if hasattr(locale, "textdomain"): -+# locale.textdomain("deluge") - gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) - gettext.textdomain("deluge") - gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) diff -urN /usr/ports/net-p2p/deluge/files/patch-disable_check_update net-p2p/deluge/files/patch-disable_check_update --- /usr/ports/net-p2p/deluge/files/patch-disable_check_update 2009-03-19 15:23:27.000000000 +0900 +++ net-p2p/deluge/files/patch-disable_check_update 1970-01-01 09:00:00.000000000 +0900 @@ -1,523 +0,0 @@ ---- deluge/core/core.py.orig 2009-01-17 11:39:22.000000000 -0600 -+++ deluge/core/core.py 2009-01-17 11:40:58.000000000 -0600 -@@ -216,9 +216,6 @@ - # Start the AuthManager - self.authmanager = AuthManager() - -- # New release check information -- self.new_release = None -- - component.start("PreferencesManager") - component.start() - -@@ -303,54 +300,6 @@ - except Exception, e: - log.warning("Failed to save dht state: %s", e) - -- def get_new_release(self): -- log.debug("get_new_release") -- from urllib2 import urlopen -- try: -- self.new_release = urlopen( -- "http://download.deluge-torrent.org/version-1.0").read().strip() -- except Exception, e: -- log.debug("Unable to get release info from website: %s", e) -- return -- self.check_new_release() -- -- def check_new_release(self): -- if self.new_release: -- log.debug("new_release: %s", self.new_release) -- class VersionSplit(object): -- def __init__(self, ver): -- ver = ver.lower() -- vs = ver.split("_") if "_" in ver else ver.split("-") -- self.version = vs[0] -- self.suffix = None -- if len(vs) > 1: -- for s in ("rc", "alpha", "beta", "dev"): -- if s in vs[1][:len(s)]: -- self.suffix = vs[1] -- -- def __cmp__(self, ver): -- if self.version > ver.version or (self.suffix and self.suffix[:3] == "dev"): -- return 1 -- if self.version < ver.version: -- return -1 -- -- if self.version == ver.version: -- if self.suffix == ver.suffix: -- return 0 -- if self.suffix is None: -- return 1 -- if ver.suffix is None: -- return -1 -- if self.suffix < ver.suffix: -- return -1 -- if self.suffix > ver.suffix: -- return 1 -- -- if VersionSplit(self.new_release) > VersionSplit(deluge.common.get_version()): -- self.signals.emit("new_version_available", self.new_release) -- return self.new_release -- return False -- - # Exported Methods - def export_ping(self): - """A method to see if the core is running""" -@@ -365,8 +314,6 @@ - """Registers a client with the signal manager so that signals are - sent to it.""" - self.signals.register_client(self.client_address, port) -- if self.config["new_release_check"]: -- self.check_new_release() - - def export_deregister_client(self): - """De-registers a client with the signal manager.""" ---- deluge/core/preferencesmanager.py.orig 2009-01-17 11:48:36.000000000 -0600 -+++ deluge/core/preferencesmanager.py 2009-01-17 11:48:42.000000000 -0600 -@@ -93,7 +93,6 @@ - "auto_managed": True, - "move_completed": False, - "move_completed_path": deluge.common.get_default_download_dir(), -- "new_release_check": True, - "proxies": { - "peer": { - "type": 0, -@@ -203,9 +202,6 @@ - self._on_send_info) - self.config.register_set_function("proxies", - self._on_set_proxies) -- self.new_release_timer = None -- self.config.register_set_function("new_release_check", -- self._on_new_release_check) - self.config.register_set_function("rate_limit_ip_overhead", - self._on_rate_limit_ip_overhead) - -@@ -444,19 +440,6 @@ - if value: - Send_Info_Thread(self.config).start() - -- def _on_new_release_check(self, key, value): -- if value: -- log.debug("Checking for new release..") -- threading.Thread(target=self.core.get_new_release).start() -- if self.new_release_timer: -- gobject.source_remove(self.new_release_timer) -- # Set a timer to check for a new release every 3 days -- self.new_release_timer = gobject.timeout_add( -- 72 * 60 * 60 * 1000, self._on_new_release_check, "new_release_check", True) -- else: -- if self.new_release_timer: -- gobject.source.remove(self.new_release_timer) -- - def _on_set_proxies(self, key, value): - for k, v in value.items(): - if v["type"]: ---- deluge/ui/gtkui/glade/main_window.glade.orig 2009-03-17 22:54:36.000000000 -0500 -+++ deluge/ui/gtkui/glade/main_window.glade 2009-03-17 22:55:10.000000000 -0500 -@@ -2404,196 +2404,6 @@ - - - -- -- 5 -- New Release -- GTK_WIN_POS_CENTER_ON_PARENT -- deluge -- GDK_WINDOW_TYPE_HINT_DIALOG -- False -- -- -- True -- 2 -- -- -- True -- 10 -- 5 -- -- -- True -- 5 -- -- -- True -- gtk-missing-image -- -- -- False -- False -- -- -- -- -- True -- <b><big>New Release Available!</big></b> -- True -- -- -- False -- False -- 1 -- -- -- -- -- False -- False -- -- -- -- -- True -- -- -- False -- 1 -- -- -- -- -- True -- 5 -- -- -- True -- 2 -- 2 -- 10 -- 2 -- -- -- True -- 0 -- <i>Current Version:</i> -- True -- -- -- GTK_FILL -- -- -- -- -- True -- -- -- 1 -- 2 -- -- -- -- -- -- True -- 0 -- <i>Available Version:</i> -- True -- -- -- 1 -- 2 -- GTK_FILL -- -- -- -- -- True -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- -- -- -- 2 -- -- -- -- -- True -- 5 -- -- -- True -- True -- Do not show this dialog in the future -- 0 -- True -- -- -- -- -- 3 -- -- -- -- -- False -- False -- 1 -- -- -- -- -- True -- GTK_BUTTONBOX_END -- -- -- True -- True -- True -- gtk-close -- True -- 0 -- -- -- False -- False -- -- -- -- -- True -- True -- True -- _Goto Website -- True -- 0 -- -- -- -- False -- False -- 1 -- -- -- -- -- False -- False -- GTK_PACK_END -- -- -- -- -- - - True - ---- deluge/ui/gtkui/glade/preferences_dialog.glade.orig 2009-01-17 11:39:34.000000000 -0600 -+++ deluge/ui/gtkui/glade/preferences_dialog.glade 2009-01-17 11:43:26.000000000 -0600 -@@ -2070,66 +2070,6 @@ - - - -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- 0 -- GTK_SHADOW_NONE -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- 2 -- 12 -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- -- -- True -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- Deluge will check our servers and will tell you if a newer version has been released -- Be alerted about new releases -- 0 -- True -- -- -- -- -- False -- False -- -- -- -- -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- <b>Updates</b> -- True -- -- -- label_item -- -- -- -- -- False -- False -- 5 -- 2 -- -- -- - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -@@ -2381,49 +2321,6 @@ - 3 - - -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- 0 -- GTK_SHADOW_NONE -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- 5 -- 10 -- -- -- True -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- Periodically check the website for new releases -- 0 -- True -- -- -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- <b>Other</b> -- True -- -- -- label_item -- -- -- -- -- False -- False -- 5 -- 4 -- -- - - - ---- deluge/ui/gtkui/gtkui.py.orig 2009-01-17 11:39:41.000000000 -0600 -+++ deluge/ui/gtkui/gtkui.py 2009-01-17 11:44:09.000000000 -0600 -@@ -69,7 +69,6 @@ - "start_in_tray": False, - "lock_tray": False, - "tray_password": "", -- "check_new_releases": True, - "default_load_path": None, - "window_maximized": False, - "window_x_pos": 0, -@@ -89,7 +88,6 @@ - "autoadd_enable": False, - "autoadd_location": "", - "choose_directory_dialog_path": deluge.common.get_default_download_dir(), -- "show_new_releases": True, - "signal_port": 40000, - "ntf_tray_blink": True, - "ntf_sound": False, ---- deluge/ui/gtkui/preferences.py.orig 2009-01-17 11:39:46.000000000 -0600 -+++ deluge/ui/gtkui/preferences.py 2009-01-17 11:45:11.000000000 -0600 -@@ -219,7 +219,6 @@ - "chk_natpmp": ("active", self.core_config["natpmp"]), - "chk_utpex": ("active", self.core_config["utpex"]), - "chk_lsd": ("active", self.core_config["lsd"]), -- "chk_new_releases": ("active", self.core_config["new_release_check"]), - "chk_send_info": ("active", self.core_config["send_info"]), - "combo_encin": ("active", self.core_config["enc_in_policy"]), - "combo_encout": ("active", self.core_config["enc_out_policy"]), -@@ -360,7 +359,6 @@ - "chk_utpex", - "chk_lsd", - "chk_send_info", -- "chk_new_releases", - "combo_encin", - "combo_encout", - "combo_enclevel", -@@ -426,10 +424,6 @@ - self.glade.get_widget("chk_show_rate_in_title").set_active( - self.gtkui_config["show_rate_in_title"]) - -- ## Other tab ## -- self.glade.get_widget("chk_show_new_releases").set_active( -- self.gtkui_config["show_new_releases"]) -- - ## Notification tab ## - self.glade.get_widget("chk_ntf_tray_blink").set_active( - self.gtkui_config["ntf_tray_blink"]) -@@ -639,8 +633,6 @@ - new_gtkui_config["ntf_security"] = 'TLS' - - ## Other tab ## -- new_gtkui_config["show_new_releases"] = \ -- self.glade.get_widget("chk_show_new_releases").get_active() - new_core_config["send_info"] = \ - self.glade.get_widget("chk_send_info").get_active() - -@@ -649,8 +641,6 @@ - self.glade.get_widget("spin_daemon_port").get_value_as_int() - new_core_config["allow_remote"] = \ - self.glade.get_widget("chk_allow_remote_connections").get_active() -- new_core_config["new_release_check"] = \ -- self.glade.get_widget("chk_new_releases").get_active() - - ## Proxy tab ## - new_core_config["proxies"] = {} ---- deluge/ui/gtkui/signals.py.orig 2009-01-17 11:39:51.000000000 -0600 -+++ deluge/ui/gtkui/signals.py 2009-01-17 11:46:08.000000000 -0600 -@@ -60,8 +60,6 @@ - self.torrent_queue_changed) - self.receiver.connect_to_signal("torrent_resume_at_stop_ratio", - self.torrent_resume_at_stop_ratio) -- self.receiver.connect_to_signal("new_version_available", -- self.new_version_available) - self.receiver.connect_to_signal("args_from_external", - self.args_from_external) - self.receiver.connect_to_signal("torrent_state_changed", -@@ -140,12 +138,6 @@ - component.get("StatusBar").display_warning( - text=_("Torrent is past stop ratio.")) - -- def new_version_available(self, value): -- log.debug("new_version_available: %s", value) -- if self.config["show_new_releases"]: -- from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog -- NewReleaseDialog().show(value) -- - def args_from_external(self, value): - log.debug("args_from_external: %s", value) - import ipcinterface diff -urN /usr/ports/net-p2p/deluge/pkg-plist net-p2p/deluge/pkg-plist --- /usr/ports/net-p2p/deluge/pkg-plist 2009-03-19 15:23:27.000000000 +0900 +++ net-p2p/deluge/pkg-plist 2009-05-28 03:15:57.000000000 +0900 @@ -1,10 +1,10 @@ bin/deluge bin/deluged -%%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info/entry_points.txt -%%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info/top_level.txt +%%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/deluge/SimpleXMLRPCServer.py %%PYTHON_SITELIBDIR%%/deluge/SimpleXMLRPCServer.pyc %%PYTHON_SITELIBDIR%%/deluge/SimpleXMLRPCServer.pyo @@ -427,8 +427,8 @@ %%PYTHON_SITELIBDIR%%/deluge/pluginmanagerbase.py %%PYTHON_SITELIBDIR%%/deluge/pluginmanagerbase.pyc %%PYTHON_SITELIBDIR%%/deluge/pluginmanagerbase.pyo -%%PYTHON_SITELIBDIR%%/deluge/plugins/Blocklist-1.0-py2.5.egg -%%PYTHON_SITELIBDIR%%/deluge/plugins/Label-0.1-py2.5.egg +%%PYTHON_SITELIBDIR%%/deluge/plugins/Blocklist-1.0-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/deluge/plugins/Label-0.1-py%%PYTHON_VER%%.egg %%PYTHON_SITELIBDIR%%/deluge/plugins/__init__.py %%PYTHON_SITELIBDIR%%/deluge/plugins/__init__.pyc %%PYTHON_SITELIBDIR%%/deluge/plugins/__init__.pyo @@ -1174,7 +1174,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/deluge/data/pixmaps @dirrm %%PYTHON_SITELIBDIR%%/deluge/data @dirrm %%PYTHON_SITELIBDIR%%/deluge/core -@dirrm %%PYTHON_SITELIBDIR%%/deluge-1.1.5-py2.5.egg-info +@dirrm %%PYTHON_SITELIBDIR%%/deluge-%%VERSION%%-py%%PYTHON_VER%%.egg-info @dirrm %%PYTHON_SITELIBDIR%%/deluge @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true