Re: deluge: Remove obsolete x11/py-gtk2 dependency
On 2020/04/25 15:39, Klemens Nanni wrote:
> On Sat, Apr 25, 2020 at 10:59:20AM +0200, Antoine Jacoutot wrote:
> > 2 things
> > - isn't it missing a RUN_DEPENDS on x11/gtk+3 then?
> Indeed, I thought the existing x11/gtk+3,-guic RDEP already covered this,
> but it does not; `pkg_delete gtk+3' removes a lot but not deluge-gtk,
> which then obviously fails to start:
>
> $ deluge-gtk
> Traceback (most recent call last):
> File "/usr/local/bin/deluge-gtk", line 11, in
> load_entry_point('deluge==2.0.3', 'gui_scripts', 'deluge-gtk')()
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 63,
> in start
> Gtk().start()
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 43,
> in start
> from .gtkui import GtkUI
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/gtkui.py", line 21, in
>
> gi.require_version('Gtk', '3.0') # NOQA: E402
> File "/usr/local/lib/python3.7/site-packages/gi/__init__.py", line
> 133, in require_version
> (namespace, version))
> ValueError: Namespace Gtk not available for version 3.0
>
> Updated diff below adds the missing BDEP; updating deluge-gtk with it
> pulls all dependencies in on an otherwise pristine installation and
> deluge-gtk starts fine (still without GTK+2 installed).
>
> > - please fix hardcoding the python3 FLAVOR, use ${MODPY_VERSION}
> Will do of course, just not including it here for clarity.
>
> Thanks for the input.
>
> Feedback? OK?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/deluge/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 6 Feb 2020 20:00:22 - 1.8
> +++ Makefile 25 Apr 2020 13:35:18 -
> @@ -4,6 +4,7 @@ COMMENT = bittorrent client
>
> DISTNAME = deluge-${MODPY_EGG_VERSION}
> MODPY_EGG_VERSION = 2.0.3
> +REVISION = 0
>
> CATEGORIES = net
>
> @@ -34,7 +35,7 @@ RUN_DEPENDS = devel/desktop-file-utils
> net/libtorrent-rasterbar \
> textproc/py-chardet,python3 \
> www/py-mako,python3 \
> - x11/gtk+3,-guic \
> - x11/py-gtk2
> + x11/gtk+3,-guic
> + x11/gtk+3 \
Mind your backslashes!
>
> .include
>
Re: deluge: Remove obsolete x11/py-gtk2 dependency
On Sat, Apr 25, 2020 at 03:39:30PM +0200, Klemens Nanni wrote:
> On Sat, Apr 25, 2020 at 10:59:20AM +0200, Antoine Jacoutot wrote:
> > 2 things
> > - isn't it missing a RUN_DEPENDS on x11/gtk+3 then?
> Indeed, I thought the existing x11/gtk+3,-guic RDEP already covered this,
Nope.
x11/gtk+3,-guic is gtk-update-icon-cache which only requires gdk-pixbuf2 and
glib2.
> but it does not; `pkg_delete gtk+3' removes a lot but not deluge-gtk,
> which then obviously fails to start:
>
> $ deluge-gtk
> Traceback (most recent call last):
> File "/usr/local/bin/deluge-gtk", line 11, in
> load_entry_point('deluge==2.0.3', 'gui_scripts', 'deluge-gtk')()
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 63,
> in start
> Gtk().start()
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 43,
> in start
> from .gtkui import GtkUI
> File
> "/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/gtkui.py", line 21, in
>
> gi.require_version('Gtk', '3.0') # NOQA: E402
> File "/usr/local/lib/python3.7/site-packages/gi/__init__.py", line
> 133, in require_version
> (namespace, version))
> ValueError: Namespace Gtk not available for version 3.0
>
> Updated diff below adds the missing BDEP; updating deluge-gtk with it
> pulls all dependencies in on an otherwise pristine installation and
> deluge-gtk starts fine (still without GTK+2 installed).
>
> > - please fix hardcoding the python3 FLAVOR, use ${MODPY_VERSION}
> Will do of course, just not including it here for clarity.
>
> Thanks for the input.
>
> Feedback? OK?
OK with MODPY_VERSION when you commit this change.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/deluge/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 6 Feb 2020 20:00:22 - 1.8
> +++ Makefile 25 Apr 2020 13:35:18 -
> @@ -4,6 +4,7 @@ COMMENT = bittorrent client
>
> DISTNAME = deluge-${MODPY_EGG_VERSION}
> MODPY_EGG_VERSION = 2.0.3
> +REVISION = 0
>
> CATEGORIES = net
>
> @@ -34,7 +35,7 @@ RUN_DEPENDS = devel/desktop-file-utils
> net/libtorrent-rasterbar \
> textproc/py-chardet,python3 \
> www/py-mako,python3 \
> - x11/gtk+3,-guic \
> - x11/py-gtk2
> + x11/gtk+3,-guic
> + x11/gtk+3 \
>
> .include
>
--
Antoine
Re: deluge: Remove obsolete x11/py-gtk2 dependency
On Sat, Apr 25, 2020 at 10:59:20AM +0200, Antoine Jacoutot wrote:
> 2 things
> - isn't it missing a RUN_DEPENDS on x11/gtk+3 then?
Indeed, I thought the existing x11/gtk+3,-guic RDEP already covered this,
but it does not; `pkg_delete gtk+3' removes a lot but not deluge-gtk,
which then obviously fails to start:
$ deluge-gtk
Traceback (most recent call last):
File "/usr/local/bin/deluge-gtk", line 11, in
load_entry_point('deluge==2.0.3', 'gui_scripts', 'deluge-gtk')()
File
"/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 63,
in start
Gtk().start()
File
"/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/__init__.py", line 43,
in start
from .gtkui import GtkUI
File
"/usr/local/lib/python3.7/site-packages/deluge/ui/gtk3/gtkui.py", line 21, in
gi.require_version('Gtk', '3.0') # NOQA: E402
File "/usr/local/lib/python3.7/site-packages/gi/__init__.py", line
133, in require_version
(namespace, version))
ValueError: Namespace Gtk not available for version 3.0
Updated diff below adds the missing BDEP; updating deluge-gtk with it
pulls all dependencies in on an otherwise pristine installation and
deluge-gtk starts fine (still without GTK+2 installed).
> - please fix hardcoding the python3 FLAVOR, use ${MODPY_VERSION}
Will do of course, just not including it here for clarity.
Thanks for the input.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/net/deluge/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile6 Feb 2020 20:00:22 - 1.8
+++ Makefile25 Apr 2020 13:35:18 -
@@ -4,6 +4,7 @@ COMMENT = bittorrent client
DISTNAME = deluge-${MODPY_EGG_VERSION}
MODPY_EGG_VERSION =2.0.3
+REVISION = 0
CATEGORIES = net
@@ -34,7 +35,7 @@ RUN_DEPENDS = devel/desktop-file-utils
net/libtorrent-rasterbar \
textproc/py-chardet,python3 \
www/py-mako,python3 \
- x11/gtk+3,-guic \
- x11/py-gtk2
+ x11/gtk+3,-guic
+ x11/gtk+3 \
.include
Re: deluge: Remove obsolete x11/py-gtk2 dependency
On Sat, Apr 25, 2020 at 03:28:53AM +0200, Klemens Nanni wrote:
>
> rsadowski's last update of deluge moved it to Python 3. GTK+2 is no
> longer in use, deluge-gtk uses GTK+3.
>
> Builds and runs fine without x11/py-gtk2 installed, which is Python 2
> only and therefore kept pulling it in.
>
> OK?
2 things
- isn't it missing a RUN_DEPENDS on x11/gtk+3 then?
- please fix hardcoding the python3 FLAVOR, use ${MODPY_VERSION}
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/deluge/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 6 Feb 2020 20:00:22 - 1.8
> +++ Makefile 25 Apr 2020 01:13:30 -
> @@ -4,6 +4,7 @@ COMMENT = bittorrent client
>
> DISTNAME = deluge-${MODPY_EGG_VERSION}
> MODPY_EGG_VERSION = 2.0.3
> +REVISION = 0
>
> CATEGORIES = net
>
> @@ -34,7 +35,6 @@ RUN_DEPENDS = devel/desktop-file-utils
> net/libtorrent-rasterbar \
> textproc/py-chardet,python3 \
> www/py-mako,python3 \
> - x11/gtk+3,-guic \
> - x11/py-gtk2
> + x11/gtk+3,-guic
>
> .include
>
--
Antoine
Re: deluge: Remove obsolete x11/py-gtk2 dependency
On Sat, Apr 25, 2020 at 03:28:53AM +0200, Klemens Nanni wrote: > > rsadowski's last update of deluge moved it to Python 3. GTK+2 is no > longer in use, deluge-gtk uses GTK+3. > > Builds and runs fine without x11/py-gtk2 installed, which is Python 2 > only and therefore kept pulling it in. > > OK? ok gsoares@
deluge: Remove obsolete x11/py-gtk2 dependency
rsadowski's last update of deluge moved it to Python 3. GTK+2 is no
longer in use, deluge-gtk uses GTK+3.
Builds and runs fine without x11/py-gtk2 installed, which is Python 2
only and therefore kept pulling it in.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/deluge/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile6 Feb 2020 20:00:22 - 1.8
+++ Makefile25 Apr 2020 01:13:30 -
@@ -4,6 +4,7 @@ COMMENT = bittorrent client
DISTNAME = deluge-${MODPY_EGG_VERSION}
MODPY_EGG_VERSION =2.0.3
+REVISION = 0
CATEGORIES = net
@@ -34,7 +35,6 @@ RUN_DEPENDS = devel/desktop-file-utils
net/libtorrent-rasterbar \
textproc/py-chardet,python3 \
www/py-mako,python3 \
- x11/gtk+3,-guic \
- x11/py-gtk2
+ x11/gtk+3,-guic
.include
