* [PR PATCH] deluge: update to 2.0.3
@ 2019-06-29 13:49 voidlinux-github
2019-06-29 21:04 ` voidlinux-github
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/12734
deluge: update to 2.0.3
A patch file from https://github.com/void-linux/void-packages/pull/12734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-12734.patch --]
[-- Type: application/text/x-diff, Size: 2862 bytes --]
From c86776ed2c73fcc8887bc08bd2e4d6afb6f86d55 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 29 Jun 2019 16:48:27 +0300
Subject: [PATCH] deluge: update to 2.0.3
---
.../patches/001-deluge-gtk-settings.patch | 18 ------------------
srcpkgs/deluge/template | 12 ++++++------
2 files changed, 6 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
diff --git a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch b/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
deleted file mode 100644
index 71241e2aef9..00000000000
--- a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes settings dialog for Deluge 1.3.15
-
---- deluge/ui/gtkui/preferences.py
-+++ deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
- }
- # Add proxy stuff
-
-- # Display workaround for single proxy in libtorrent >v0.16
-- try:
-- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
-- except AttributeError:
-- lt_single_proxy = False
-+ # Display workaround for single proxy in libtorrent >= v0.16
-+ lt_single_proxy = True
-
- for t in ("peer", "web_seed", "tracker", "dht"):
- if lt_single_proxy and not t == "peer":
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 819b5fecdb9..1b41737fc7f 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
# Template file for 'deluge'
pkgname=deluge
-version=1.3.15
-revision=4
+version=2.0.3
+revision=1
archs=noarch
build_style=python2-module
pycompile_module="deluge"
@@ -12,8 +12,8 @@ short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
-distfiles="https://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz"
-checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
+checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -29,11 +29,11 @@ deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} pygtk"
+ depends="${sourcepkg}-${version}_${revision} python-gobject"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
- vmove ${py2_sitelib}/deluge/ui/gtkui
+ vmove ${py2_sitelib}/deluge/ui/gtk3
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/man/man1/deluge.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
@ 2019-06-29 21:04 ` voidlinux-github
2019-06-29 21:22 ` voidlinux-github
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-506987069
Comment:
Starting with v2.0.0, deluge's codebase has been ported to Python3, so this would be a good chance to convert `deluge`'s and `libtorrent-rasterbar-python`'s template to Python3.
(libtorrent-rasterbar-python is only used by deluge)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
2019-06-29 21:04 ` voidlinux-github
@ 2019-06-29 21:22 ` voidlinux-github
2019-06-29 21:22 ` voidlinux-github
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-506988032
Comment:
I am testing an libtorrent-rasterbar update to 1.2.1, so I will make the change and then update the deluge template ;)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
2019-06-29 21:04 ` voidlinux-github
2019-06-29 21:22 ` voidlinux-github
@ 2019-06-29 21:22 ` voidlinux-github
2019-06-29 21:42 ` voidlinux-github
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-506988032
Comment:
I am testing an libtorrent-rasterbar update to 1.2.1, so I will make the changes there and then update the deluge template ;)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (2 preceding siblings ...)
2019-06-29 21:22 ` voidlinux-github
@ 2019-06-29 21:42 ` voidlinux-github
2019-06-29 21:46 ` voidlinux-github
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-506989123
Comment:
Unfortunately, qbittorrent is currently blocking libtorrent-rasterbar>=1.2.0 as qbittorrent 4.1.x doesn't support it. 4.2.x will be compatible with 1.2.0 though.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (3 preceding siblings ...)
2019-06-29 21:42 ` voidlinux-github
@ 2019-06-29 21:46 ` voidlinux-github
2019-06-30 16:43 ` voidlinux-github
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-29 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-506989346
Comment:
Ok. I 'll make the changes to a new revision of the current libtorrent-rasterbar version.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (4 preceding siblings ...)
2019-06-29 21:46 ` voidlinux-github
@ 2019-06-30 16:43 ` voidlinux-github
2019-06-30 17:31 ` voidlinux-github
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-30 16:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-507050369
Comment:
I can't build libtorrent-rasterbar. Configure finds boost-python (new dependency) and insists it is the wrong version, even if it is passed explicitly.
See the [template](https://termbin.com/nhgc).
```
checking whether the Boost::Python library is available... yes
checking whether boost_python36 is the correct library... no
checking whether boost_python-boost_python36 is the correct library... no
checking whether boost_python27 is the correct library... no
checking whether boost_python27 is the correct library... (cached) no
checking whether boost_python27 is the correct library... (cached) no
checking whether boost_python36 is the correct library... (cached) no
checking whether boost_python36 is the correct library... (cached) no
checking whether boost_python36 is the correct library... (cached) no
checking whether boost_python is the correct library... no
checking whether boost_python3 is the correct library... no
configure: error: Boost.Python library not found. Try using --with-boost-python=lib.
```
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (5 preceding siblings ...)
2019-06-30 16:43 ` voidlinux-github
@ 2019-06-30 17:31 ` voidlinux-github
2019-06-30 17:37 ` voidlinux-github
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-30 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-507053404
Comment:
The `m` is missing here:
```
export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython3.6m"
^
```
Oh and `libtorrent-rasterbar-python` should be renamed to `libtorrent-rasterbar-python3` to follow Void's python naming convention.
This package rename should be safe as only deluge is depending on it:
```
$ xbps-query -RX libtorrent-rasterbar-python
deluge-1.3.15_4
```
Just to make sure this doesn't break anything.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (6 preceding siblings ...)
2019-06-30 17:31 ` voidlinux-github
@ 2019-06-30 17:37 ` voidlinux-github
2019-07-02 12:35 ` [PR PATCH] [Updated] " voidlinux-github
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-30 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-507053404
Comment:
The `m` is missing here:
```
export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython3.6m"
^
```
Oh and `libtorrent-rasterbar-python` should be renamed to `libtorrent-rasterbar-python3` to follow Void's python naming convention.
This package rename should be safe as only deluge is depending on it:
```
$ xbps-query -RX libtorrent-rasterbar-python
deluge-1.3.15_4
```
Just to make sure this doesn't break anything.
EDIT:
And adding `boost-python3-1.69` to {host,}makedepends is not necessary, `boost-devel` is enough, the shlib itself is auto-detected by xbps.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (8 preceding siblings ...)
2019-07-02 12:35 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-02 12:35 ` voidlinux-github
2019-07-02 12:38 ` voidlinux-github
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-02 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/12734
deluge: update to 2.0.3
A patch file from https://github.com/void-linux/void-packages/pull/12734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-12734.patch --]
[-- Type: application/text/x-diff, Size: 3614 bytes --]
From e16fa49b621573f1a10f54b81f0b26b6f8f45fa4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 29 Jun 2019 16:48:27 +0300
Subject: [PATCH] deluge: update to 2.0.3
---
.../patches/001-deluge-gtk-settings.patch | 18 --------------
srcpkgs/deluge/template | 24 +++++++++----------
2 files changed, 12 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
diff --git a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch b/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
deleted file mode 100644
index 71241e2aef9..00000000000
--- a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes settings dialog for Deluge 1.3.15
-
---- deluge/ui/gtkui/preferences.py
-+++ deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
- }
- # Add proxy stuff
-
-- # Display workaround for single proxy in libtorrent >v0.16
-- try:
-- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
-- except AttributeError:
-- lt_single_proxy = False
-+ # Display workaround for single proxy in libtorrent >= v0.16
-+ lt_single_proxy = True
-
- for t in ("peer", "web_seed", "tracker", "dht"):
- if lt_single_proxy and not t == "peer":
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 819b5fecdb9..f062c1d7d42 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,19 +1,19 @@
# Template file for 'deluge'
pkgname=deluge
-version=1.3.15
-revision=4
+version=2.0.3
+revision=1
archs=noarch
-build_style=python2-module
+build_style=python3-module
pycompile_module="deluge"
-hostmakedepends="intltool python-setuptools"
-depends="python-setuptools python-chardet python-Twisted python-xdg
- libtorrent-rasterbar-python"
+hostmakedepends="intltool python3-setuptools"
+depends="python3-setuptools python3-chardet python3-Twisted python3-xdg
+ libtorrent-rasterbar-python3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
-distfiles="https://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz"
-checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
+checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -29,11 +29,11 @@ deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} pygtk"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
- vmove ${py2_sitelib}/deluge/ui/gtkui
+ vmove ${py3_sitelib}/deluge/ui/gtk3
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/man/man1/deluge.1
@@ -45,10 +45,10 @@ deluge-web_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - Web frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} python-Mako"
+ depends="${sourcepkg}-${version}_${revision} python3-Mako"
pkg_install() {
vmove usr/bin/deluge-web
- vmove ${py2_sitelib}/deluge/ui/web
+ vmove ${py3_sitelib}/deluge/ui/web
vmove usr/share/man/man1/deluge-web.1
vsv deluge-web
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (7 preceding siblings ...)
2019-06-30 17:37 ` voidlinux-github
@ 2019-07-02 12:35 ` voidlinux-github
2019-07-02 12:35 ` voidlinux-github
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-02 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/12734
deluge: update to 2.0.3
A patch file from https://github.com/void-linux/void-packages/pull/12734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-12734.patch --]
[-- Type: application/text/x-diff, Size: 3614 bytes --]
From e16fa49b621573f1a10f54b81f0b26b6f8f45fa4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 29 Jun 2019 16:48:27 +0300
Subject: [PATCH] deluge: update to 2.0.3
---
.../patches/001-deluge-gtk-settings.patch | 18 --------------
srcpkgs/deluge/template | 24 +++++++++----------
2 files changed, 12 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
diff --git a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch b/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
deleted file mode 100644
index 71241e2aef9..00000000000
--- a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes settings dialog for Deluge 1.3.15
-
---- deluge/ui/gtkui/preferences.py
-+++ deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
- }
- # Add proxy stuff
-
-- # Display workaround for single proxy in libtorrent >v0.16
-- try:
-- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
-- except AttributeError:
-- lt_single_proxy = False
-+ # Display workaround for single proxy in libtorrent >= v0.16
-+ lt_single_proxy = True
-
- for t in ("peer", "web_seed", "tracker", "dht"):
- if lt_single_proxy and not t == "peer":
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 819b5fecdb9..f062c1d7d42 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,19 +1,19 @@
# Template file for 'deluge'
pkgname=deluge
-version=1.3.15
-revision=4
+version=2.0.3
+revision=1
archs=noarch
-build_style=python2-module
+build_style=python3-module
pycompile_module="deluge"
-hostmakedepends="intltool python-setuptools"
-depends="python-setuptools python-chardet python-Twisted python-xdg
- libtorrent-rasterbar-python"
+hostmakedepends="intltool python3-setuptools"
+depends="python3-setuptools python3-chardet python3-Twisted python3-xdg
+ libtorrent-rasterbar-python3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
-distfiles="https://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz"
-checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
+checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -29,11 +29,11 @@ deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} pygtk"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
- vmove ${py2_sitelib}/deluge/ui/gtkui
+ vmove ${py3_sitelib}/deluge/ui/gtk3
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/man/man1/deluge.1
@@ -45,10 +45,10 @@ deluge-web_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - Web frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} python-Mako"
+ depends="${sourcepkg}-${version}_${revision} python3-Mako"
pkg_install() {
vmove usr/bin/deluge-web
- vmove ${py2_sitelib}/deluge/ui/web
+ vmove ${py3_sitelib}/deluge/ui/web
vmove usr/share/man/man1/deluge-web.1
vsv deluge-web
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (9 preceding siblings ...)
2019-07-02 12:35 ` voidlinux-github
@ 2019-07-02 12:38 ` voidlinux-github
2019-07-03 20:18 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-02 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/12734#issuecomment-507658532
Comment:
Pushed changes to build with python3. Will not build in the ci, until https://github.com/void-linux/void-packages/pull/12761 is merged.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (10 preceding siblings ...)
2019-07-02 12:38 ` voidlinux-github
@ 2019-07-03 20:18 ` voidlinux-github
2019-07-03 20:18 ` voidlinux-github
2019-07-04 15:42 ` [PR PATCH] [Merged]: " voidlinux-github
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-03 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/12734
deluge: update to 2.0.3
A patch file from https://github.com/void-linux/void-packages/pull/12734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-12734.patch --]
[-- Type: application/text/x-diff, Size: 3614 bytes --]
From cd6f4366778c5e0383bee0aa4bf646aa4c1a1acd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 29 Jun 2019 16:48:27 +0300
Subject: [PATCH] deluge: update to 2.0.3
---
.../patches/001-deluge-gtk-settings.patch | 18 --------------
srcpkgs/deluge/template | 24 +++++++++----------
2 files changed, 12 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
diff --git a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch b/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
deleted file mode 100644
index 71241e2aef9..00000000000
--- a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes settings dialog for Deluge 1.3.15
-
---- deluge/ui/gtkui/preferences.py
-+++ deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
- }
- # Add proxy stuff
-
-- # Display workaround for single proxy in libtorrent >v0.16
-- try:
-- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
-- except AttributeError:
-- lt_single_proxy = False
-+ # Display workaround for single proxy in libtorrent >= v0.16
-+ lt_single_proxy = True
-
- for t in ("peer", "web_seed", "tracker", "dht"):
- if lt_single_proxy and not t == "peer":
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 819b5fecdb9..f062c1d7d42 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,19 +1,19 @@
# Template file for 'deluge'
pkgname=deluge
-version=1.3.15
-revision=4
+version=2.0.3
+revision=1
archs=noarch
-build_style=python2-module
+build_style=python3-module
pycompile_module="deluge"
-hostmakedepends="intltool python-setuptools"
-depends="python-setuptools python-chardet python-Twisted python-xdg
- libtorrent-rasterbar-python"
+hostmakedepends="intltool python3-setuptools"
+depends="python3-setuptools python3-chardet python3-Twisted python3-xdg
+ libtorrent-rasterbar-python3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
-distfiles="https://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz"
-checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
+checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -29,11 +29,11 @@ deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} pygtk"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
- vmove ${py2_sitelib}/deluge/ui/gtkui
+ vmove ${py3_sitelib}/deluge/ui/gtk3
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/man/man1/deluge.1
@@ -45,10 +45,10 @@ deluge-web_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - Web frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} python-Mako"
+ depends="${sourcepkg}-${version}_${revision} python3-Mako"
pkg_install() {
vmove usr/bin/deluge-web
- vmove ${py2_sitelib}/deluge/ui/web
+ vmove ${py3_sitelib}/deluge/ui/web
vmove usr/share/man/man1/deluge-web.1
vsv deluge-web
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (11 preceding siblings ...)
2019-07-03 20:18 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-03 20:18 ` voidlinux-github
2019-07-04 15:42 ` [PR PATCH] [Merged]: " voidlinux-github
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-03 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/12734
deluge: update to 2.0.3
A patch file from https://github.com/void-linux/void-packages/pull/12734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-12734.patch --]
[-- Type: application/text/x-diff, Size: 3614 bytes --]
From cd6f4366778c5e0383bee0aa4bf646aa4c1a1acd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 29 Jun 2019 16:48:27 +0300
Subject: [PATCH] deluge: update to 2.0.3
---
.../patches/001-deluge-gtk-settings.patch | 18 --------------
srcpkgs/deluge/template | 24 +++++++++----------
2 files changed, 12 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
diff --git a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch b/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
deleted file mode 100644
index 71241e2aef9..00000000000
--- a/srcpkgs/deluge/patches/001-deluge-gtk-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes settings dialog for Deluge 1.3.15
-
---- deluge/ui/gtkui/preferences.py
-+++ deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
- }
- # Add proxy stuff
-
-- # Display workaround for single proxy in libtorrent >v0.16
-- try:
-- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
-- except AttributeError:
-- lt_single_proxy = False
-+ # Display workaround for single proxy in libtorrent >= v0.16
-+ lt_single_proxy = True
-
- for t in ("peer", "web_seed", "tracker", "dht"):
- if lt_single_proxy and not t == "peer":
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 819b5fecdb9..f062c1d7d42 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,19 +1,19 @@
# Template file for 'deluge'
pkgname=deluge
-version=1.3.15
-revision=4
+version=2.0.3
+revision=1
archs=noarch
-build_style=python2-module
+build_style=python3-module
pycompile_module="deluge"
-hostmakedepends="intltool python-setuptools"
-depends="python-setuptools python-chardet python-Twisted python-xdg
- libtorrent-rasterbar-python"
+hostmakedepends="intltool python3-setuptools"
+depends="python3-setuptools python3-chardet python3-Twisted python3-xdg
+ libtorrent-rasterbar-python3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
-distfiles="https://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz"
-checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
+checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -29,11 +29,11 @@ deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} pygtk"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
- vmove ${py2_sitelib}/deluge/ui/gtkui
+ vmove ${py3_sitelib}/deluge/ui/gtk3
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/man/man1/deluge.1
@@ -45,10 +45,10 @@ deluge-web_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - Web frontend"
pycompile_module="deluge"
- depends="${sourcepkg}-${version}_${revision} python-Mako"
+ depends="${sourcepkg}-${version}_${revision} python3-Mako"
pkg_install() {
vmove usr/bin/deluge-web
- vmove ${py2_sitelib}/deluge/ui/web
+ vmove ${py3_sitelib}/deluge/ui/web
vmove usr/share/man/man1/deluge-web.1
vsv deluge-web
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Merged]: deluge: update to 2.0.3
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
` (12 preceding siblings ...)
2019-07-03 20:18 ` voidlinux-github
@ 2019-07-04 15:42 ` voidlinux-github
13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-07-04 15:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
There's a merged pull request on the void-packages repository
deluge: update to 2.0.3
https://github.com/void-linux/void-packages/pull/12734
Description:
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2019-07-04 15:42 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-29 13:49 [PR PATCH] deluge: update to 2.0.3 voidlinux-github
2019-06-29 21:04 ` voidlinux-github
2019-06-29 21:22 ` voidlinux-github
2019-06-29 21:22 ` voidlinux-github
2019-06-29 21:42 ` voidlinux-github
2019-06-29 21:46 ` voidlinux-github
2019-06-30 16:43 ` voidlinux-github
2019-06-30 17:31 ` voidlinux-github
2019-06-30 17:37 ` voidlinux-github
2019-07-02 12:35 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-02 12:35 ` voidlinux-github
2019-07-02 12:38 ` voidlinux-github
2019-07-03 20:18 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-03 20:18 ` voidlinux-github
2019-07-04 15:42 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).