<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec2ed685da9adfe1e572bf030eed77df061006ce">https://github.com/macports/macports-ports/commit/ec2ed685da9adfe1e572bf030eed77df061006ce</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 ec2ed685da9 deluge: update to 2.0.5; refactor pythons; default to python 3.10 - Python 3.11 requires a fix for Boost See: https://github.com/macports/macports-ports/pull/16069#issuecomment-1566229756
</span>ec2ed685da9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ec2ed685da9adfe1e572bf030eed77df061006ce
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Sep 10 00:37:00 2022 +0700
<span style='display:block; white-space:pre;color:#404040;'> deluge: update to 2.0.5; refactor pythons; default to python 3.10
</span><span style='display:block; white-space:pre;color:#404040;'> - Python 3.11 requires a fix for Boost
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/16069#issuecomment-1566229756
</span>---
net/deluge/Portfile | 167 ++++++++++----------------
net/deluge/files/fix-gettext-warning.patch | 24 ----
net/deluge/files/install-icons-manpages.patch | 6 +-
net/deluge/files/logging-python38-fixes.patch | 69 -----------
net/deluge/files/pass-full-mp-libpath.patch | 14 +--
5 files changed, 73 insertions(+), 207 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 3f595c2420e..eba7f106441 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;'>@@ -2,149 +2,108 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup boost 1.0
</span> PortGroup active_variants 1.1
name deluge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories net gnome python
license {GPL-3+ OpenSSLException}
maintainers {devans @dbevans} openmaintainer
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span>
description A GNOME BitTorrent client.
long_description Deluge is a GNOME client for the BitTorrent network written in python.
homepage http://www.deluge-torrent.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin any}
</span>
master_sites https://ftp.osuosl.org/pub/deluge/source/2.0/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ed887d87b711513be63fb800d64f44dbea834bb8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1777624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4faabca4319fba02a35e70d441c22f1340d1a0fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1895268
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libtorrent-rasterbar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtorrent-rasterbar
</span>
# ensures SVG pixbufs can be loaded
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span> path:lib/pkgconfig/librsvg-2.0.pc:librsvg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:adwaita-icon-theme
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pass-full-mp-libpath.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-gettext-warning.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- logging-python38-fixes.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-icons-manpages.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append install-icons-manpages.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append pass-full-mp-libpath.patch
</span>
post-patch {
reinplace "s|@@MP_PREFIX@@|${prefix}|" \
${worksrcpath}/deluge/i18n/util.py
}
<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:#ffe0e0;'>- PYTHON_LDFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_CFLAGS=-I${prefix}/include -I[boost::include_dir]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LDFLAGS=-L${prefix}/lib -L[boost::lib_dir]\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-I${prefix}/include -I$[boost::include_dir]" \
</span> CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python38 description {Build for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libtorrent-rasterbar python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-wheel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-service_identity \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-twisted \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-asn1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-rencode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-xdg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-Pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-mako \
</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-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-setproctitle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc py_setup {python_branch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_version [string map {"." ""} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version ${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.link_binaries no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libtorrent-rasterbar python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-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:py${python_version}-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-rencode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-service_identity \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-twisted \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-xdg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-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 python38 conflicts python39 python310 python311 description {Build for Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.8
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python310 description {Build for Python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libtorrent-rasterbar python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-wheel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-service_identity \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-twisted \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-asn1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-rencode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-xdg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-Pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-mako \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-setproctitle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 python311 description {Build for Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.9
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python310 description {Build for Python 3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libtorrent-rasterbar python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-wheel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-service_identity \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-twisted \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-asn1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-rencode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-xdg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-Pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-mako \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-setproctitle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 python311 description {Build for Python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.10
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python27 python39 description {Build for Python 3.10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libtorrent-rasterbar python310
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 310
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-wheel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-service_identity \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-twisted \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-asn1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-rencode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-xdg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-Pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-mako \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-setproctitle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python38 python39 python310 description {Build for Python 3.11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.11
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.link_binaries no
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/files/fix-gettext-warning.patch b/net/deluge/files/fix-gettext-warning.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c3a22fbff0f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/files/fix-gettext-warning.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: neeshy <neeshy@tfwno.gf>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 18 Apr 2020 23:23:51 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix warning related to gettext
</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;'>- deluge/i18n/util.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bd002f7..90568fc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deluge/i18n/util.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deluge/i18n/util.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +114,7 @@ def setup_translation():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libintl = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v1.1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/files/install-icons-manpages.patch b/net/deluge/files/install-icons-manpages.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 317a8ed5412..97528e92c35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/files/install-icons-manpages.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/deluge/files/install-icons-manpages.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2020-10-21 11:44:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2020-10-21 11:45:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -454,7 +454,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-12-14 05:07:14.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-09-10 00:17:27.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -459,7 +459,7 @@
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/files/logging-python38-fixes.patch b/net/deluge/files/logging-python38-fixes.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e68c670f907..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/files/logging-python38-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 351664ec071daa04161577c6a1c949ed0f2c3206 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: minus <minus@mnus.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 17 Nov 2019 09:36:23 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] [Logging] Fix Python 3.8 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Deluge's logger class extends Python's `logging.Logger`. Since Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-3.8, it takes an additional argument `stacklevel`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The implementation in Deluge does not support that. Work around the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-problem by ignoring additional arguments.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deluge/log.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deluge/log.py b/deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 75e8308b5..0f9877fdb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@ def critical(self, msg, *args, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def exception(self, msg, *args, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- def findCaller(self, stack_info=False): # NOQA: N802
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def findCaller(self, *args, **kwargs): # NOQA: N802
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = logging.currentframe().f_back
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rv = '(unknown file)', 0, '(unknown function)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while hasattr(f, 'f_code'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5e06aee5c8846f94bd5fcc209132dacf06de781f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: minus <minus@mnus.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 19 Nov 2019 17:14:01 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] [Logging] Fix findCaller with unknown source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In case no source was found, a 3-tuple was returned instead of a 4-tuple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in Python 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deluge/log.py | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deluge/log.py b/deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f9877fdb..bf4f3c2d7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deluge/log.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,7 @@ def exception(self, msg, *args, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def findCaller(self, *args, **kwargs): # NOQA: N802
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = logging.currentframe().f_back
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rv = '(unknown file)', 0, '(unknown function)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rv = ('(unknown file)', 0, '(unknown function)', None)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while hasattr(f, 'f_code'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- co = f.f_code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filename = os.path.normcase(co.co_filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,12 +98,12 @@ def findCaller(self, *args, **kwargs): # NOQA: N802
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = f.f_back
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if common.PY2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rv = (filename, f.f_lineno, co.co_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rv = (filename, f.f_lineno, co.co_name, None)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rv = (co.co_filename, f.f_lineno, co.co_name, None)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return rv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if common.PY2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return rv[:-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return rv
</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;'>- levels = {
</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><span style='display:block; white-space:pre;color:#808080;'>index 9b82543cac8..788ef639ada 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/files/pass-full-mp-libpath.patch
</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;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deluge/i18n/util.py.orig 2019-08-13 12:30:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deluge/i18n/util.py 2019-08-13 12:32:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log.error(exception)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup_mock_translation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deluge/i18n/util.py.orig 2021-12-16 01:35:31.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deluge/i18n/util.py 2022-09-10 01:04:09.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if deluge.common.windows_check():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libintl = load_libintl(['libintl-8.dll', 'intl.dll'])
</span> elif deluge.common.osx_check():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- libintl = ctypes.cdll.LoadLibrary('libintl.dylib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libintl = ctypes.cdll.LoadLibrary('@@MP_PREFIX@@/lib/libintl.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libintl = load_libintl(['libintl.8.dylib', 'libintl.dylib'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libintl = load_libintl(['@@MP_PREFIX@@/lib/libintl.8.dylib', '@@MP_PREFIX@@/lib/libintl.dylib'])
</span>
if libintl:
libintl.bindtextdomain(
</pre><pre style='margin:0'>
</pre>