On Mon, Feb 17, 2020 at 12:12:37AM +0100, Juan Francisco Cantero Hurtado wrote:
> tortoisehg is the last consumer of py-qt4. With this patch, we can
> remove py-qt4 from ports.
>
> I need a python2+qt5 version of qscintilla for the change in tortoise
> and qgis is the only consumer of the python3+qt5 flavor. Instead of
> adding more complexity to the py-qscintilla port, I made the port qt5
> only. The port is now a standard python2+python3 port.
>
> Landry, I imported qscintilla in the python console of qgis and worked
> without errors. Could you test qgis with this patch and give me an OK
> for the qgis change?.
>
> Any additional test of qgis or tortoisehg is welcome.
There is a common file in both flavors. I added -main and -common to
py-qscintilla as workaround.
The new patch includes also the update to 2.11.4 and rsadowski's
suggestions.
diff --git devel/quirks/Makefile devel/quirks/Makefile
index 67c02303c3f..48ce59ae8b9 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.237
+PKGNAME = quirks-3.238
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index f7ec3251e7a..50361d449ca 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -339,6 +339,7 @@ my $stem_extensions = {
'ilmbase' => 'OpenEXR',
'openexr-viewers' => 'OpenEXR-tools',
'libvirt-python' => 'py-libvirt',
+ 'py3-qscintilla-qt5' => 'py3-qscintilla',
};
my $obsolete_reason = {
diff --git devel/tortoisehg/Makefile devel/tortoisehg/Makefile
index 5282f4db222..03fb9e166c9 100644
--- devel/tortoisehg/Makefile
+++ devel/tortoisehg/Makefile
@@ -2,9 +2,9 @@
COMMENT = series of applications for Mercurial
-# Change also the mercurial version in *_depends
+# Change also the mercurial version in MERCURIAL_VER
MODPY_EGG_VERSION = 5.0.2
-REVISION = 2
+REVISION = 3
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -24,14 +24,13 @@ MERCURIAL_VER = devel/mercurial>=5.0,<5.1
BUILD_DEPENDS = ${MERCURIAL_VER} \
devel/py-sip \
- editors/qscintilla \
- x11/py-qt4
+ x11/py-qt5
RUN_DEPENDS = ${MERCURIAL_VER} \
devel/py-iniparse \
devel/py-sip \
editors/py-qscintilla \
- x11/py-qt4
+ x11/py-qt5
NO_TEST = Yes
diff --git editors/Makefile editors/Makefile
index cbae99787c2..8945753c8db 100644
--- editors/Makefile
+++ editors/Makefile
@@ -49,7 +49,7 @@
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
SUBDIR += py-qscintilla
- SUBDIR += py-qscintilla,qt5
+ SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += qscintilla,qt5
SUBDIR += scintilla
diff --git editors/py-qscintilla/Makefile editors/py-qscintilla/Makefile
index b907d7708c9..e9c25c63e99 100644
--- editors/py-qscintilla/Makefile
+++ editors/py-qscintilla/Makefile
@@ -1,68 +1,70 @@
# $OpenBSD: Makefile,v 1.20 2019/07/24 08:50:19 landry Exp $
-COMMENT = Python binding for the Scintilla source code editor
+COMMENT-main = Python binding for the Scintilla source code editor
+COMMENT-common = common files for py-qscintilla
-VERSION = 2.11.2
-DISTNAME = QScintilla_gpl-${VERSION}
-PKGNAME = py-qscintilla-${VERSION}
-CATEGORIES = editors x11 devel
+VERSION = 2.11.4
+MODPY_EGG_VERSION = ${VERSION}
+DISTNAME = QScintilla-${VERSION}
-HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
+PKGNAME-main = py-qscintilla-${VERSION}
+FULLPKGNAME-common = py-qscintilla-common-${VERSION}
+FULLPKGPATH-common = editors/py-qscintilla,-common
+
+CATEGORIES = editors x11 devel
+
+HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
+
+WANTLIB-main += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB-main += Qt5Widgets qscintilla2_qt5
-MODULES = lang/python
-FLAVORS = qt5
-FLAVOR?=
+WANTLIB-common +=
-RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
- x11/dbus-python${MODPY_FLAVOR}
+MULTI_PACKAGES = -main -common
+MODULES = lang/python \
+ x11/qt5
+QTVER = qt5
+PYQTVER = PyQt5
+SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
-WANTLIB = ${COMPILER_LIBCXX} m
+FLAVORS = python3
+FLAVOR ?=
+
+.if ${FLAVOR:Mpython3}
+FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
+FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
+.endif
+
+BUILD_DEPENDS-main = ${RUN_DEPENDS}
+RUN_DEPENDS-main = devel/py-sip${MODPY_FLAVOR} \
+ x11/dbus-python${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR} \
+ editors/py-qscintilla,-common
+LIB_DEPENDS-main = editors/qscintilla,qt5=${VERSION}
+
+LIB_DEPENDS-common =
COMPILER = base-clang ports-gcc base-gcc
-WRKSRC = ${WRKDIST}/Python
+WRKSRC = ${WRKDIST}/Python
-NO_TEST = Yes
+NO_TEST = Yes
-CONFIGURE_STYLE = simple
+CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
-.if ${FLAVOR} == "qt5"
-FULLPKGNAME = py3-qscintilla-qt5-${VERSION}
-QTVER = qt5
-PYQTVER = PyQt5
-SIPDIR= share/sip/PyQt5-3
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS += x11/py-qt5${MODPY_FLAVOR}
-MODULES += x11/qt5
-LIB_DEPENDS = editors/qscintilla,qt5=${VERSION}
-CONFIGURE_ARGS = --qmake=${LOCALBASE}/bin/qmake-qt5 \
- --sip=${LOCALBASE}/bin/sip-3
-WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets qscintilla2_qt5
-.else
-QTVER = qt4
-SIPDIR= share/sip
-PYQTVER = PyQt4
-RUN_DEPENDS += x11/py-qt4
-MODULES += x11/qt4
-LIB_DEPENDS = editors/qscintilla=${VERSION}
-CONFIGURE_ARGS = --qmake=${LOCALBASE}/bin/qmake4 \
- --sip=${LOCALBASE}/bin/sip
-WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
-WANTLIB += freetype qscintilla2_qt4
-.endif
-
-CONFIGURE_ARGS +=--pyqt=${PYQTVER} -w \
- --qsci-libdir=${LOCALBASE}/lib \
- --pyqt-sipdir=${LOCALBASE}/${SIPDIR}
-BUILD_DEPENDS = ${RUN_DEPENDS}
-MAKE_ENV = INSTALL_ROOT="${WRKINST}"
-SUBST_VARS += QTVER PYQTVER SIPDIR
+CONFIGURE_ARGS += --pyqt=${PYQTVER} -w \
+ --qsci-libdir=${LOCALBASE}/lib \
+ --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
+ --qmake=${MODQT5_QMAKE} \
+ --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX}
+MAKE_ENV = INSTALL_ROOT="${WRKINST}"
+SUBST_VARS += QTVER PYQTVER SIPDIR
.include <bsd.port.mk>
diff --git editors/py-qscintilla/distinfo editors/py-qscintilla/distinfo
index 210bd7893b9..72bdcbba220 100644
--- editors/py-qscintilla/distinfo
+++ editors/py-qscintilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
-SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
+SHA256 (QScintilla-2.11.4.tar.gz) =
cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
+SIZE (QScintilla-2.11.4.tar.gz) = 3007719
diff --git editors/py-qscintilla/pkg/DESCR editors/py-qscintilla/pkg/DESCR
deleted file mode 100644
index 024a45d8b8d..00000000000
--- editors/py-qscintilla/pkg/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python binding for QScintilla.
diff --git editors/py-qscintilla/pkg/DESCR-common
editors/py-qscintilla/pkg/DESCR-common
new file mode 100644
index 00000000000..5bce7e6b5c4
--- /dev/null
+++ editors/py-qscintilla/pkg/DESCR-common
@@ -0,0 +1 @@
+Common files for py-qscintilla.
diff --git editors/py-qscintilla/pkg/DESCR-main
editors/py-qscintilla/pkg/DESCR-main
new file mode 100644
index 00000000000..024a45d8b8d
--- /dev/null
+++ editors/py-qscintilla/pkg/DESCR-main
@@ -0,0 +1 @@
+Python binding for QScintilla.
diff --git editors/py-qscintilla/pkg/PLIST editors/py-qscintilla/pkg/PLIST
deleted file mode 100644
index fe4a5d6841d..00000000000
--- editors/py-qscintilla/pkg/PLIST
+++ /dev/null
@@ -1,64 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/07/24 08:50:19 landry Exp $
-lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
-lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/INSTALLER
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/RECORD
-lib/${QTVER}/qsci/api/python/QScintilla2.api
-${SIPDIR}/Qsci/
-${SIPDIR}/Qsci/qsciabstractapis.sip
-${SIPDIR}/Qsci/qsciapis.sip
-${SIPDIR}/Qsci/qscicommand.sip
-${SIPDIR}/Qsci/qscicommandset.sip
-${SIPDIR}/Qsci/qscidocument.sip
-${SIPDIR}/Qsci/qscilexer.sip
-${SIPDIR}/Qsci/qscilexeravs.sip
-${SIPDIR}/Qsci/qscilexerbash.sip
-${SIPDIR}/Qsci/qscilexerbatch.sip
-${SIPDIR}/Qsci/qscilexercmake.sip
-${SIPDIR}/Qsci/qscilexercoffeescript.sip
-${SIPDIR}/Qsci/qscilexercpp.sip
-${SIPDIR}/Qsci/qscilexercsharp.sip
-${SIPDIR}/Qsci/qscilexercss.sip
-${SIPDIR}/Qsci/qscilexercustom.sip
-${SIPDIR}/Qsci/qscilexerd.sip
-${SIPDIR}/Qsci/qscilexerdiff.sip
-${SIPDIR}/Qsci/qscilexeredifact.sip
-${SIPDIR}/Qsci/qscilexerfortran.sip
-${SIPDIR}/Qsci/qscilexerfortran77.sip
-${SIPDIR}/Qsci/qscilexerhtml.sip
-${SIPDIR}/Qsci/qscilexeridl.sip
-${SIPDIR}/Qsci/qscilexerjava.sip
-${SIPDIR}/Qsci/qscilexerjavascript.sip
-${SIPDIR}/Qsci/qscilexerjson.sip
-${SIPDIR}/Qsci/qscilexerlua.sip
-${SIPDIR}/Qsci/qscilexermakefile.sip
-${SIPDIR}/Qsci/qscilexermarkdown.sip
-${SIPDIR}/Qsci/qscilexermatlab.sip
-${SIPDIR}/Qsci/qscilexeroctave.sip
-${SIPDIR}/Qsci/qscilexerpascal.sip
-${SIPDIR}/Qsci/qscilexerperl.sip
-${SIPDIR}/Qsci/qscilexerpo.sip
-${SIPDIR}/Qsci/qscilexerpostscript.sip
-${SIPDIR}/Qsci/qscilexerpov.sip
-${SIPDIR}/Qsci/qscilexerproperties.sip
-${SIPDIR}/Qsci/qscilexerpython.sip
-${SIPDIR}/Qsci/qscilexerruby.sip
-${SIPDIR}/Qsci/qscilexerspice.sip
-${SIPDIR}/Qsci/qscilexersql.sip
-${SIPDIR}/Qsci/qscilexertcl.sip
-${SIPDIR}/Qsci/qscilexertex.sip
-${SIPDIR}/Qsci/qscilexerverilog.sip
-${SIPDIR}/Qsci/qscilexervhdl.sip
-${SIPDIR}/Qsci/qscilexerxml.sip
-${SIPDIR}/Qsci/qscilexeryaml.sip
-${SIPDIR}/Qsci/qscimacro.sip
-${SIPDIR}/Qsci/qscimod4.sip
-${SIPDIR}/Qsci/qscimod5.sip
-${SIPDIR}/Qsci/qscimodcommon.sip
-${SIPDIR}/Qsci/qsciprinter.sip
-${SIPDIR}/Qsci/qsciscintilla.sip
-${SIPDIR}/Qsci/qsciscintillabase.sip
-${SIPDIR}/Qsci/qscistyle.sip
-${SIPDIR}/Qsci/qscistyledtext.sip
diff --git editors/py-qscintilla/pkg/PLIST-common
editors/py-qscintilla/pkg/PLIST-common
new file mode 100644
index 00000000000..d43b5d3b607
--- /dev/null
+++ editors/py-qscintilla/pkg/PLIST-common
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.6 2019/07/24 08:50:19 landry Exp $
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
+@pkgpath editors/py-qscintilla,${QTVER}
+lib/${QTVER}/qsci/
+lib/${QTVER}/qsci/api/
+lib/${QTVER}/qsci/api/python/
+lib/${QTVER}/qsci/api/python/QScintilla2.api
diff --git editors/py-qscintilla/pkg/PLIST-main
editors/py-qscintilla/pkg/PLIST-main
new file mode 100644
index 00000000000..a7649566044
--- /dev/null
+++ editors/py-qscintilla/pkg/PLIST-main
@@ -0,0 +1,65 @@
+@comment $OpenBSD: PLIST,v 1.6 2019/07/24 08:50:19 landry Exp $
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
+@pkgpath editors/py-qscintilla,${QTVER}
+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/
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
+${SIPDIR}/Qsci/
+${SIPDIR}/Qsci/qsciabstractapis.sip
+${SIPDIR}/Qsci/qsciapis.sip
+${SIPDIR}/Qsci/qscicommand.sip
+${SIPDIR}/Qsci/qscicommandset.sip
+${SIPDIR}/Qsci/qscidocument.sip
+${SIPDIR}/Qsci/qscilexer.sip
+${SIPDIR}/Qsci/qscilexeravs.sip
+${SIPDIR}/Qsci/qscilexerbash.sip
+${SIPDIR}/Qsci/qscilexerbatch.sip
+${SIPDIR}/Qsci/qscilexercmake.sip
+${SIPDIR}/Qsci/qscilexercoffeescript.sip
+${SIPDIR}/Qsci/qscilexercpp.sip
+${SIPDIR}/Qsci/qscilexercsharp.sip
+${SIPDIR}/Qsci/qscilexercss.sip
+${SIPDIR}/Qsci/qscilexercustom.sip
+${SIPDIR}/Qsci/qscilexerd.sip
+${SIPDIR}/Qsci/qscilexerdiff.sip
+${SIPDIR}/Qsci/qscilexeredifact.sip
+${SIPDIR}/Qsci/qscilexerfortran.sip
+${SIPDIR}/Qsci/qscilexerfortran77.sip
+${SIPDIR}/Qsci/qscilexerhtml.sip
+${SIPDIR}/Qsci/qscilexeridl.sip
+${SIPDIR}/Qsci/qscilexerjava.sip
+${SIPDIR}/Qsci/qscilexerjavascript.sip
+${SIPDIR}/Qsci/qscilexerjson.sip
+${SIPDIR}/Qsci/qscilexerlua.sip
+${SIPDIR}/Qsci/qscilexermakefile.sip
+${SIPDIR}/Qsci/qscilexermarkdown.sip
+${SIPDIR}/Qsci/qscilexermatlab.sip
+${SIPDIR}/Qsci/qscilexeroctave.sip
+${SIPDIR}/Qsci/qscilexerpascal.sip
+${SIPDIR}/Qsci/qscilexerperl.sip
+${SIPDIR}/Qsci/qscilexerpo.sip
+${SIPDIR}/Qsci/qscilexerpostscript.sip
+${SIPDIR}/Qsci/qscilexerpov.sip
+${SIPDIR}/Qsci/qscilexerproperties.sip
+${SIPDIR}/Qsci/qscilexerpython.sip
+${SIPDIR}/Qsci/qscilexerruby.sip
+${SIPDIR}/Qsci/qscilexerspice.sip
+${SIPDIR}/Qsci/qscilexersql.sip
+${SIPDIR}/Qsci/qscilexertcl.sip
+${SIPDIR}/Qsci/qscilexertex.sip
+${SIPDIR}/Qsci/qscilexerverilog.sip
+${SIPDIR}/Qsci/qscilexervhdl.sip
+${SIPDIR}/Qsci/qscilexerxml.sip
+${SIPDIR}/Qsci/qscilexeryaml.sip
+${SIPDIR}/Qsci/qscimacro.sip
+${SIPDIR}/Qsci/qscimod4.sip
+${SIPDIR}/Qsci/qscimod5.sip
+${SIPDIR}/Qsci/qscimodcommon.sip
+${SIPDIR}/Qsci/qsciprinter.sip
+${SIPDIR}/Qsci/qsciscintilla.sip
+${SIPDIR}/Qsci/qsciscintillabase.sip
+${SIPDIR}/Qsci/qscistyle.sip
+${SIPDIR}/Qsci/qscistyledtext.sip
diff --git editors/qscintilla/Makefile editors/qscintilla/Makefile
index 1016c98eb54..855296dda91 100644
--- editors/qscintilla/Makefile
+++ editors/qscintilla/Makefile
@@ -3,9 +3,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.11.2
-DISTNAME = QScintilla_gpl-${VERSION}
-PKGNAME = qscintilla-${VERSION}
+VERSION = 2.11.4
+DISTNAME = QScintilla-${VERSION}
+PKGNAME = ${DISTNAME:L}
CATEGORIES = editors x11
diff --git editors/qscintilla/distinfo editors/qscintilla/distinfo
index 210bd7893b9..72bdcbba220 100644
--- editors/qscintilla/distinfo
+++ editors/qscintilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
-SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
+SHA256 (QScintilla-2.11.4.tar.gz) =
cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
+SIZE (QScintilla-2.11.4.tar.gz) = 3007719
diff --git geo/qgis/Makefile geo/qgis/Makefile
index 02239990f7c..2bcb0b811ef 100644
--- geo/qgis/Makefile
+++ geo/qgis/Makefile
@@ -10,7 +10,7 @@ DISTNAME = qgis-3.10.2
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}
-REVISION = 1
+REVISION = 2
SHARED_LIBS = qgis_core 39.0 \
qgis_app 22.0 \
@@ -42,7 +42,7 @@ BUILD_DEPENDS = x11/py-qt5${MODPY_FLAVOR} \
devel/py-sip${MODPY_FLAVOR}>=4.19.4v0 \
geo/gdal,-python${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
- editors/py-qscintilla,qt5 \
+ editors/py-qscintilla${MODPY_FLAVOR} \
devel/bison>=2.4
@@ -54,7 +54,7 @@ RUN_DEPENDS = x11/py-qt5${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR} \
- editors/py-qscintilla,qt5 \
+ editors/py-qscintilla${MODPY_FLAVOR} \
devel/desktop-file-utils \
x11/gtk+3,-guic \
misc/shared-mime-info
