<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67a2917c2b020e25cb6be5074d70f0ac609f11e1">https://github.com/macports/macports-ports/commit/67a2917c2b020e25cb6be5074d70f0ac609f11e1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 67a2917 deluge: update to version 2.0.3, dependencies, livecheck
</span>67a2917 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67a2917c2b020e25cb6be5074d70f0ac609f11e1
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Aug 13 00:07:43 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> deluge: update to version 2.0.3, dependencies, livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now provides gtk3 UI via gobject introspection and supports
</span><span style='display:block; white-space:pre;color:#404040;'> python3 as well as python2.
</span>---
net/deluge/Portfile | 90 +++++++++++++++-------
net/deluge/files/pass-full-mp-libpath.patch | 11 +++
.../files/patch-remove-osx-native-menus.diff | 50 ------------
3 files changed, 74 insertions(+), 77 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/Portfile b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7332178..f449647 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup python 1.0
</span> PortGroup active_variants 1.1
name deluge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net gnome python
license {GPL-3+ OpenSSLException}
maintainers {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,50 +17,90 @@ long_description Deluge is a GNOME client for the BitTorrent network written
</span> homepage http://www.deluge-torrent.org
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.deluge-torrent.org/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://ftp.osuosl.org/pub/deluge/source/2.0/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 42bce46edd8f21c4fe1c00bbc1ccb49f89582f38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dcf823131be56c2180814e8def11496aaaf700710b5694867ba9f057615ac790
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ed887d87b711513be63fb800d64f44dbea834bb8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1777624
</span>
depends_lib-append port:libtorrent-rasterbar \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:librsvg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xdg-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensures SVG pixbufs can be loaded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles pass-full-mp-libpath.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MP_PREFIX@@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/deluge/i18n/util.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-remove-osx-native-menus.diff
</span> if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "PYTHON_CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env "PYTHON_CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span> PYTHON_LDFLAGS=-L${prefix}/lib \
"CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
</span> PYTHON_LDFLAGS=-L${prefix}/lib \
CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Build for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python37 description {Build for Python 2.7} {
</span> require_active_variants libtorrent-rasterbar python27
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dbus-python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-game \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pygtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span> port:py27-setuptools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-xdg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-gobject3 \
</span> port:py27-service_identity \
port:py27-twisted \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-rencode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-xdg \
</span> port:py27-openssl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-mako
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 description {Build for Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libtorrent-rasterbar python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-service_identity \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-twisted \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-rencode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-xdg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-zopeinterface
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
python.link_binaries no
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +108,3 @@ post-destroot {
</span> ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://download.deluge-torrent.org/source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/files/pass-full-mp-libpath.patch b/net/deluge/files/pass-full-mp-libpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9b82543
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/deluge/files/pass-full-mp-libpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deluge/i18n/util.py.orig 2019-08-13 12:30:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deluge/i18n/util.py 2019-08-13 12:32:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.error(exception)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setup_mock_translation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif deluge.common.osx_check():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libintl = ctypes.cdll.LoadLibrary('libintl.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libintl = ctypes.cdll.LoadLibrary('@@MP_PREFIX@@/lib/libintl.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if libintl:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libintl.bindtextdomain(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/files/patch-remove-osx-native-menus.diff b/net/deluge/files/patch-remove-osx-native-menus.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61d521d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/files/patch-remove-osx-native-menus.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deluge/ui/gtkui/gtkui.py.orig 2017-03-06 01:56:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deluge/ui/gtkui/gtkui.py 2017-03-10 17:53:51.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,12 +217,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetConsoleCtrlHandler(win_handler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- import gtkosx_application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.osxapp = gtkosx_application.gtkosx_application_get()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- def on_die(*args):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- reactor.stop()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.osxapp.connect("NSApplicationWillTerminate", on_die)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# import gtkosx_application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# self.osxapp = gtkosx_application.gtkosx_application_get()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# def on_die(*args):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# reactor.stop()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# self.osxapp.connect("NSApplicationWillTerminate", on_die)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set process name again to fix gtk issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,17 +266,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.statusbar = StatusBar()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.addtorrentdialog = AddTorrentDialog()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- def nsapp_open_file(osxapp, filename):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Ignore command name which is raised at app launch (python opening main script).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if filename == sys.argv[0]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from deluge.ui.gtkui.ipcinterface import process_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- process_args([filename])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from menubar_osx import menubar_osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- menubar_osx(self, self.osxapp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.osxapp.ready()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# def nsapp_open_file(osxapp, filename):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # Ignore command name which is raised at app launch (python opening main script).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if filename == sys.argv[0]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# return True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# from deluge.ui.gtkui.ipcinterface import process_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# process_args([filename])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# from menubar_osx import menubar_osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# menubar_osx(self, self.osxapp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# self.osxapp.ready()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Initalize the plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.plugins = PluginManager()
</span></pre><pre style='margin:0'>
</pre>