Re: removal of devel/py-gobject3 (!python3)
On Fri, Oct 02, 2020 at 09:33:04PM +0100, Stuart Henderson wrote: > On 2020/10/02 22:08, Klemens Nanni wrote: > > On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote: > > > On 2020/10/02 21:25, Klemens Nanni wrote: > > > > Updated diff after quirks churn. > > > > > > -common should get merged back in too, I think this is the way: > > As noted in my other (older) mail the -common subpackage also hardcodes > > "py-" instead of "py3-" as prefix, but I wanted to fix this in a > > separate diff. > > > > Yours looks better of course, are you fine with doing these as separate > > commits? If so, OK kn for yours after I removed the Python 2 flavour. > > I guess, it is a pain with cvs though. Then just go ahead with your diff and my OK, you already have it :)
Re: removal of devel/py-gobject3 (!python3)
On 2020/10/02 22:08, Klemens Nanni wrote:
> On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote:
> > On 2020/10/02 21:25, Klemens Nanni wrote:
> > > Updated diff after quirks churn.
> >
> > -common should get merged back in too, I think this is the way:
> As noted in my other (older) mail the -common subpackage also hardcodes
> "py-" instead of "py3-" as prefix, but I wanted to fix this in a
> separate diff.
>
> Yours looks better of course, are you fine with doing these as separate
> commits? If so, OK kn for yours after I removed the Python 2 flavour.
I guess, it is a pain with cvs though.
> > Index: geo/qgis/Makefile
> > ===
> > RCS file: /cvs/ports/geo/qgis/Makefile,v
> > retrieving revision 1.134
> > diff -u -p -r1.134 Makefile
> > --- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
> > +++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
> > @@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
> > DPB_PROPERTIES = parallel
> >
> > DISTNAME = qgis-3.14.16
> > +REVISION = 0
> > EXTRACT_SUFX = .tar.bz2
> > CATEGORIES = geo x11
> > DEBUG_PACKAGES =${BUILD_PACKAGES}
>
> Is this bump required?
It is, the pkgpath of the dependency changes
Re: removal of devel/py-gobject3 (!python3)
On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote:
> On 2020/10/02 21:25, Klemens Nanni wrote:
> > Updated diff after quirks churn.
>
> -common should get merged back in too, I think this is the way:
As noted in my other (older) mail the -common subpackage also hardcodes
"py-" instead of "py3-" as prefix, but I wanted to fix this in a
separate diff.
Yours looks better of course, are you fine with doing these as separate
commits? If so, OK kn for yours after I removed the Python 2 flavour.
> Index: geo/qgis/Makefile
> ===
> RCS file: /cvs/ports/geo/qgis/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
> +++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
> @@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
> DPB_PROPERTIES = parallel
>
> DISTNAME = qgis-3.14.16
> +REVISION = 0
> EXTRACT_SUFX = .tar.bz2
> CATEGORIES = geo x11
> DEBUG_PACKAGES =${BUILD_PACKAGES}
Is this bump required?
Re: removal of devel/py-gobject3 (!python3)
On 2020/10/02 21:25, Klemens Nanni wrote:
> Updated diff after quirks churn.
-common should get merged back in too, I think this is the way:
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 - 1.141
+++ editors/Makefile2 Oct 2020 19:44:45 -
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1047
diff -u -p -r1.1047 Makefile
--- devel/quirks/Makefile 25 Sep 2020 21:40:55 - 1.1047
+++ devel/quirks/Makefile 2 Oct 2020 19:44:45 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.439
+PKGNAME = quirks-3.440
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1065
diff -u -p -r1.1065 Quirks.pm
--- devel/quirks/files/Quirks.pm25 Sep 2020 21:40:55 - 1.1065
+++ devel/quirks/files/Quirks.pm2 Oct 2020 19:44:45 -
@@ -479,6 +479,8 @@ my $stem_extensions = {
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
'py-dtfabric' => 'py3-dtfabric',
+# 6.9
+ 'py-qscintilla' => 'py3-qscintilla',
};
my $obsolete_reason = {
Index: geo/qgis/Makefile
===
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
+++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
@@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
DPB_PROPERTIES = parallel
DISTNAME = qgis-3.14.16
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 - 1.25
+++ editors/py-qscintilla/Makefile 2 Oct 2020 19:44:45 -
@@ -1,16 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2020/07/03 21:12:53 sthen Exp $
-COMMENT-main = Python binding for the Scintilla source code editor
-COMMENT-common = common files for py-qscintilla
+COMMENT = Python binding for the Scintilla source code editor
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION =${VERSION}
DISTNAME = QScintilla-${VERSION}
-
-PKGNAME-main = py-qscintilla-${VERSION}
-FULLPKGNAME-common = py-qscintilla-common-${VERSION}
-FULLPKGPATH-common = editors/py-qscintilla,-common
+PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
@@ -21,12 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
-WANTLIB-main += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
-WANTLIB-main += Qt5Widgets qscintilla2_qt5
-
-WANTLIB-common +=
-
-MULTI_PACKAGES = -main -common
+WANTLIB += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB += Qt5Widgets qscintilla2_qt5
MODULES = lang/python \
x11/qt5
@@ -35,23 +27,13 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
-FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
+FLAVOR = python3
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}
-RUN_DEPENDS-main = ${RUN_DEPENDS} \
- editors/py-qscintilla,-common
-LIB_DEPENDS-main = editors/qscintilla=${VERSION}
-
-RUN_DEPENDS-common =
-LIB_DEPENDS-common =
+LIB_DEPENDS = editors/qscintilla=${VERSION}
COMPILER = base-clang ports-gcc base-gcc
Index: editors/py-qscintilla/pkg/DESCR
===
RCS file: editors/py-qscintilla/pkg/DESCR
diff -N editors/py-qscintilla/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ editors/py-qscintilla/pkg/DESCR 2 Oct 2020
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 07:09:43PM +0200, Klemens Nanni wrote:
> On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> > Hi.
> >
> > Next version of devel/py-gobject3 will loose python2 support.
> > Direct dependencies involve:
> >
> > audio/exaile
> > misc/gpsd
> > x11/dbus-python
> >
> > Out of these 3, x11/dbus-python is the most problematic because these are
> > dependending on the non python3 FLAVOR of it:
> >
> > audio/exaile
> > editors/py-qscintilla
> > net/pidgin
> > x11/py-qt4
> > x11/py-qt5
> > x11/compiz/ccsm
> >
> > We could use some help moving these to x11/dbus-python,python3 :-)
> > Thanks.
> I looked at x11/py-qt5 as user of the Python 2 flavour and came up with
> editors/py-qscintilla as user of py-qt5's Python 2 flavour.
>
> `show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user
> and qgis is Python 3 only, so we can make py-qscintilla Python 3 only
> as well - first step towards py-qt5 becoming Python 3 only.
>
> I tested the following diff with
>
> $ cd /usr/ports
> $ make -C devel/quirks package
> ...
> $ make -C editors/py-qscintilla package
> ...
> $ doas pkg_add py-qscintilla
> py-qscintilla-2.11.4p2: ok
> $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz
> quirks-3.435->3.437: ok
> $ doas pkg_add -Dunsigned ./packages/`arch
> -s`/all/py3-qscintilla-2.11.4p3.tgz
> py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok
> Read shared items: ok
>
>
> Feedback? OK?
Ping.
Updated diff after quirks churn.
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 - 1.141
+++ editors/Makefile20 Sep 2020 16:31:07 -
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 - 1.25
+++ editors/py-qscintilla/Makefile 20 Sep 2020 16:30:52 -
@@ -4,7 +4,7 @@ COMMENT-main = Python binding for the S
COMMENT-common = common files for py-qscintilla
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION =${VERSION}
DISTNAME = QScintilla-${VERSION}
@@ -35,12 +35,10 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
-.if ${FLAVOR:Mpython3}
FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
Index: editors/py-qscintilla/pkg/PLIST-common
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-common,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-common
--- editors/py-qscintilla/pkg/PLIST-common 19 Feb 2020 17:35:36 -
1.1
+++ editors/py-qscintilla/pkg/PLIST-common 20 Sep 2020 16:52:01 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict py3-qscintilla-${QTVER}-*
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
@pkgpath editors/py-qscintilla,${QTVER}
lib/${QTVER}/qsci/
lib/${QTVER}/qsci/api/
Index: editors/py-qscintilla/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- editors/py-qscintilla/pkg/PLIST-main19 Feb 2020 17:35:36 -
1.1
+++ editors/py-qscintilla/pkg/PLIST-main20 Sep 2020 16:28:56 -
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $
@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
+@conflict py-qscintilla-*
@pkgpath editors/py-qscintilla,${QTVER}
@pkgpath editors/py-qscintilla
+@pkgpath editors/py-qscintilla,-main
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1047
diff -u -p -r1.1047 Makefile
--- devel/quirks/Makefile 25 Sep 2020 21:40:55 - 1.1047
+++
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote: > Hi. > > Next version of devel/py-gobject3 will loose python2 support. > Direct dependencies involve: > > audio/exaile As for this one, we're already at the most recent version, which uses gtk+3/gst1 per https://exaile.org/2019/06/06/Exaile.4.0.0-released/ , and for the python3 support there's https://github.com/exaile/exaile/wiki/Python3-dependencies-migration-tasklist, which points at audio/py-cddb being py2 only (or dead upstream) - more discussion at https://github.com/exaile/exaile/issues/608. So from my reading, patches exist to make it py3.
Re: removal of devel/py-gobject3 (!python3)
Ok aja Thanks :-) — Antoine > On 21 Sep 2020, at 15:47, Landry Breuil wrote: > > On Mon, Sep 21, 2020 at 01:31:26PM +0200, Antoine Jacoutot wrote: >>> On Mon, Sep 21, 2020 at 10:50:43AM +0200, Landry Breuil wrote: >>> On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote: Hi. Next version of devel/py-gobject3 will loose python2 support. Direct dependencies involve: audio/exaile misc/gpsd >>> >>> Here's a diff for this one, xgps starts fine so i guess the goi imports >>> are 'okay' (corresponding python code at >>> https://gitlab.com/gpsd/gpsd/-/blob/master/xgps.in#L45) >>> >>> Bumped REVISION-main (for PLIST changes) and REVISION-x11 (to force the >>> xgps update, as MODPY_BIN changes in shebang). >>> >>> I think i got the depends right, and removed py-gtk2. Dunno if more >>> depends should be added on gtk libs ? >> >> You need to add a RUN_DEPENDS on x11/gtk+3 because: >> from gi.repository import Gtk > > Right, new diff then :) >
Re: removal of devel/py-gobject3 (!python3)
On Mon, Sep 21, 2020 at 01:31:26PM +0200, Antoine Jacoutot wrote:
> On Mon, Sep 21, 2020 at 10:50:43AM +0200, Landry Breuil wrote:
> > On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> > > Hi.
> > >
> > > Next version of devel/py-gobject3 will loose python2 support.
> > > Direct dependencies involve:
> > >
> > > audio/exaile
> > > misc/gpsd
> >
> > Here's a diff for this one, xgps starts fine so i guess the goi imports
> > are 'okay' (corresponding python code at
> > https://gitlab.com/gpsd/gpsd/-/blob/master/xgps.in#L45)
> >
> > Bumped REVISION-main (for PLIST changes) and REVISION-x11 (to force the
> > xgps update, as MODPY_BIN changes in shebang).
> >
> > I think i got the depends right, and removed py-gtk2. Dunno if more
> > depends should be added on gtk libs ?
>
> You need to add a RUN_DEPENDS on x11/gtk+3 because:
> from gi.repository import Gtk
Right, new diff then :)
Index: Makefile
===
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile26 Sep 2019 21:59:30 - 1.76
+++ Makefile21 Sep 2020 13:45:24 -
@@ -9,7 +9,7 @@
PKGNAME-main= gpsd-${VERSION}
PKGNAME-x11= gpsd-x11-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}
-REVISION-php= 0
+REVISION= 0
SHARED_LIBS += gps 20.0 # 25.0
CATEGORIES=misc geo
@@ -27,6 +27,7 @@
WANTLIB-php =
MODULES += devel/scons lang/python lang/php
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPHP_BUILDDEP= No
MODSCONS_FLAGS += gpsd_user=_gpsd \
qt=no \
@@ -39,7 +40,7 @@
MULTI_PACKAGES = -main -php -x11
-BUILD_DEPENDS= devel/py-gobject3 \
+BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
textproc/xmlto \
textproc/libxslt \
textproc/docbook \
@@ -51,12 +52,12 @@
x11/dbus \
${MODGCC4_CPPLIBDEP}
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
- devel/py-serial
+ devel/py-serial${MODPY_FLAVOR}
RUN_DEPENDS-x11 = ${BASE_PKGPATH} \
- devel/py-gobject3 \
+ devel/py-gobject3${MODPY_FLAVOR} \
devel/desktop-file-utils \
- x11/py-gtk2
+ x11/gtk+3
# the php display script doesn't depend on having any of gpsd around,
# it just sits there and looks pretty.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -r1.10 PLIST-main
--- pkg/PLIST-main 31 Jul 2019 15:44:31 - 1.10
+++ pkg/PLIST-main 21 Sep 2020 13:45:24 -
@@ -25,25 +25,26 @@
lib/python${MODPY_VERSION}/site-packages/gps/
lib/python${MODPY_VERSION}/site-packages/gps-${VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/gps/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gps/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gps/client.py
-lib/python${MODPY_VERSION}/site-packages/gps/client.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/client.${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
+@so lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
lib/python${MODPY_VERSION}/site-packages/gps/fake.py
Re: removal of devel/py-gobject3 (!python3)
On Mon, Sep 21, 2020 at 10:50:43AM +0200, Landry Breuil wrote:
> On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> > Hi.
> >
> > Next version of devel/py-gobject3 will loose python2 support.
> > Direct dependencies involve:
> >
> > audio/exaile
> > misc/gpsd
>
> Here's a diff for this one, xgps starts fine so i guess the goi imports
> are 'okay' (corresponding python code at
> https://gitlab.com/gpsd/gpsd/-/blob/master/xgps.in#L45)
>
> Bumped REVISION-main (for PLIST changes) and REVISION-x11 (to force the
> xgps update, as MODPY_BIN changes in shebang).
>
> I think i got the depends right, and removed py-gtk2. Dunno if more
> depends should be added on gtk libs ?
You need to add a RUN_DEPENDS on x11/gtk+3 because:
from gi.repository import Gtk
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/gpsd/Makefile,v
> retrieving revision 1.76
> diff -u -r1.76 Makefile
> --- Makefile 26 Sep 2019 21:59:30 - 1.76
> +++ Makefile 21 Sep 2020 08:47:23 -
> @@ -9,7 +9,7 @@
> PKGNAME-main=gpsd-${VERSION}
> PKGNAME-x11= gpsd-x11-${VERSION}
> PKGNAME-php= gpsd-php-${VERSION}
> -REVISION-php=0
> +REVISION=0
>
> SHARED_LIBS += gps 20.0 # 25.0
> CATEGORIES= misc geo
> @@ -27,6 +27,7 @@
> WANTLIB-php =
>
> MODULES += devel/scons lang/python lang/php
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> MODPHP_BUILDDEP= No
> MODSCONS_FLAGS +=gpsd_user=_gpsd \
> qt=no \
> @@ -39,7 +40,7 @@
>
> MULTI_PACKAGES = -main -php -x11
>
> -BUILD_DEPENDS= devel/py-gobject3 \
> +BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
> textproc/xmlto \
> textproc/libxslt \
> textproc/docbook \
> @@ -51,12 +52,11 @@
> x11/dbus \
> ${MODGCC4_CPPLIBDEP}
> RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
> - devel/py-serial
> + devel/py-serial${MODPY_FLAVOR}
>
> RUN_DEPENDS-x11 =${BASE_PKGPATH} \
> - devel/py-gobject3 \
> - devel/desktop-file-utils \
> - x11/py-gtk2
> + devel/py-gobject3${MODPY_FLAVOR} \
> + devel/desktop-file-utils
>
> # the php display script doesn't depend on having any of gpsd around,
> # it just sits there and looks pretty.
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -r1.10 PLIST-main
> --- pkg/PLIST-main31 Jul 2019 15:44:31 - 1.10
> +++ pkg/PLIST-main21 Sep 2020 08:47:23 -
> @@ -25,25 +25,26 @@
> lib/python${MODPY_VERSION}/site-packages/gps/
> lib/python${MODPY_VERSION}/site-packages/gps-${VERSION}.egg-info
> lib/python${MODPY_VERSION}/site-packages/gps/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/gps/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/__init__.${MODPY_PYOEXTENSION}
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gps/client.py
> -lib/python${MODPY_VERSION}/site-packages/gps/client.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/client.${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
> +@so lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
> lib/python${MODPY_VERSION}/site-packages/gps/fake.py
>
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> Hi.
>
> Next version of devel/py-gobject3 will loose python2 support.
> Direct dependencies involve:
>
> audio/exaile
> misc/gpsd
Here's a diff for this one, xgps starts fine so i guess the goi imports
are 'okay' (corresponding python code at
https://gitlab.com/gpsd/gpsd/-/blob/master/xgps.in#L45)
Bumped REVISION-main (for PLIST changes) and REVISION-x11 (to force the
xgps update, as MODPY_BIN changes in shebang).
I think i got the depends right, and removed py-gtk2. Dunno if more
depends should be added on gtk libs ?
Landry
Index: Makefile
===
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile26 Sep 2019 21:59:30 - 1.76
+++ Makefile21 Sep 2020 08:47:23 -
@@ -9,7 +9,7 @@
PKGNAME-main= gpsd-${VERSION}
PKGNAME-x11= gpsd-x11-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}
-REVISION-php= 0
+REVISION= 0
SHARED_LIBS += gps 20.0 # 25.0
CATEGORIES=misc geo
@@ -27,6 +27,7 @@
WANTLIB-php =
MODULES += devel/scons lang/python lang/php
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPHP_BUILDDEP= No
MODSCONS_FLAGS += gpsd_user=_gpsd \
qt=no \
@@ -39,7 +40,7 @@
MULTI_PACKAGES = -main -php -x11
-BUILD_DEPENDS= devel/py-gobject3 \
+BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
textproc/xmlto \
textproc/libxslt \
textproc/docbook \
@@ -51,12 +52,11 @@
x11/dbus \
${MODGCC4_CPPLIBDEP}
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
- devel/py-serial
+ devel/py-serial${MODPY_FLAVOR}
RUN_DEPENDS-x11 = ${BASE_PKGPATH} \
- devel/py-gobject3 \
- devel/desktop-file-utils \
- x11/py-gtk2
+ devel/py-gobject3${MODPY_FLAVOR} \
+ devel/desktop-file-utils
# the php display script doesn't depend on having any of gpsd around,
# it just sits there and looks pretty.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -r1.10 PLIST-main
--- pkg/PLIST-main 31 Jul 2019 15:44:31 - 1.10
+++ pkg/PLIST-main 21 Sep 2020 08:47:23 -
@@ -25,25 +25,26 @@
lib/python${MODPY_VERSION}/site-packages/gps/
lib/python${MODPY_VERSION}/site-packages/gps-${VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/gps/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gps/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gps/client.py
-lib/python${MODPY_VERSION}/site-packages/gps/client.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/client.${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
+@so lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
lib/python${MODPY_VERSION}/site-packages/gps/fake.py
-lib/python${MODPY_VERSION}/site-packages/gps/fake.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/fake.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gps/gps.py
-lib/python${MODPY_VERSION}/site-packages/gps/gps.pyc
-lib/python${MODPY_VERSION}/site-packages/gps/gps.${MODPY_PYOEXTENSION}
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 07:09:43PM +0200, Klemens Nanni wrote: > I looked at x11/py-qt5 as user of the Python 2 flavour and came up with > editors/py-qscintilla as user of py-qt5's Python 2 flavour. > > `show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user > and qgis is Python 3 only, so we can make py-qscintilla Python 3 only > as well - first step towards py-qt5 becoming Python 3 only. > > I tested the following diff with > > $ cd /usr/ports > $ make -C devel/quirks package > ... > $ make -C editors/py-qscintilla package > ... > $ doas pkg_add py-qscintilla > py-qscintilla-2.11.4p2: ok > $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz > quirks-3.435->3.437: ok > $ doas pkg_add -Dunsigned ./packages/`arch > -s`/all/py3-qscintilla-2.11.4p3.tgz > py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok > Read shared items: ok I now see that the -common subpackage hardcodes the "py-" prefix even though it uses Python 3; I can fix this in a separate diff.
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> Hi.
>
> Next version of devel/py-gobject3 will loose python2 support.
> Direct dependencies involve:
>
> audio/exaile
> misc/gpsd
> x11/dbus-python
>
> Out of these 3, x11/dbus-python is the most problematic because these are
> dependending on the non python3 FLAVOR of it:
>
> audio/exaile
> editors/py-qscintilla
> net/pidgin
> x11/py-qt4
> x11/py-qt5
> x11/compiz/ccsm
>
> We could use some help moving these to x11/dbus-python,python3 :-)
> Thanks.
I looked at x11/py-qt5 as user of the Python 2 flavour and came up with
editors/py-qscintilla as user of py-qt5's Python 2 flavour.
`show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user
and qgis is Python 3 only, so we can make py-qscintilla Python 3 only
as well - first step towards py-qt5 becoming Python 3 only.
I tested the following diff with
$ cd /usr/ports
$ make -C devel/quirks package
...
$ make -C editors/py-qscintilla package
...
$ doas pkg_add py-qscintilla
py-qscintilla-2.11.4p2: ok
$ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz
quirks-3.435->3.437: ok
$ doas pkg_add -Dunsigned ./packages/`arch
-s`/all/py3-qscintilla-2.11.4p3.tgz
py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok
Read shared items: ok
Feedback? OK?
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 - 1.141
+++ editors/Makefile20 Sep 2020 16:31:07 -
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1044
diff -u -p -r1.1044 Makefile
--- devel/quirks/Makefile 20 Sep 2020 04:27:37 - 1.1044
+++ devel/quirks/Makefile 20 Sep 2020 16:31:45 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.436
+PKGNAME = quirks-3.437
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1062
diff -u -p -r1.1062 Quirks.pm
--- devel/quirks/files/Quirks.pm20 Sep 2020 04:27:37 - 1.1062
+++ devel/quirks/files/Quirks.pm20 Sep 2020 16:34:05 -
@@ -478,6 +478,7 @@ my $stem_extensions = {
'rgain' => 'rgain3',
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
+ 'py-qscintilla' => 'py3-qscintilla',
};
my $obsolete_reason = {
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 - 1.25
+++ editors/py-qscintilla/Makefile 20 Sep 2020 16:30:52 -
@@ -4,7 +4,7 @@ COMMENT-main = Python binding for the S
COMMENT-common = common files for py-qscintilla
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION =${VERSION}
DISTNAME = QScintilla-${VERSION}
@@ -35,12 +35,10 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
-.if ${FLAVOR:Mpython3}
FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
Index: editors/py-qscintilla/pkg/PLIST-common
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-common,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-common
--- editors/py-qscintilla/pkg/PLIST-common 19 Feb 2020 17:35:36 -
1.1
+++ editors/py-qscintilla/pkg/PLIST-common 20 Sep 2020 16:52:01 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict py3-qscintilla-${QTVER}-*
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
@pkgpath editors/py-qscintilla,${QTVER}
lib/${QTVER}/qsci/
lib/${QTVER}/qsci/api/
Index: editors/py-qscintilla/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
---
