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.
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..fdba0d9d5fa 100644
--- editors/py-qscintilla/Makefile
+++ editors/py-qscintilla/Makefile
@@ -3,65 +3,50 @@
COMMENT = Python binding for the Scintilla source code editor
VERSION = 2.11.2
+REVISION = 0
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
-HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
+HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
# GPLv2/GPLv3
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE = Yes
-MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
-MODULES = lang/python
-FLAVORS = qt5
-FLAVOR?=
+WANTLIB += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB += Qt5Widgets qscintilla2_qt5
-RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
- x11/dbus-python${MODPY_FLAVOR}
+MODULES = lang/python \
+ x11/qt5
+QTVER = qt5
+PYQTVER = PyQt5
+SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
+BUILD_DEPENDS = ${RUN_DEPENDS}
+RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
+ x11/dbus-python${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+LIB_DEPENDS = editors/qscintilla,qt5=${VERSION}
-WANTLIB = ${COMPILER_LIBCXX} m
+COMPILER = base-clang ports-gcc base-gcc
-COMPILER = base-clang ports-gcc base-gcc
+FLAVORS = python3
+FLAVOR ?=
WRKSRC = ${WRKDIST}/Python
NO_TEST = Yes
CONFIGURE_STYLE = simple
-CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
+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 \
+CONFIGURE_ARGS += --pyqt=${PYQTVER} -w \
--qsci-libdir=${LOCALBASE}/lib \
- --pyqt-sipdir=${LOCALBASE}/${SIPDIR}
-BUILD_DEPENDS = ${RUN_DEPENDS}
+ --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
+ --qmake=${LOCALBASE}/bin/qmake-qt5 \
+ --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX}
MAKE_ENV = INSTALL_ROOT="${WRKINST}"
SUBST_VARS += QTVER PYQTVER SIPDIR
diff --git editors/py-qscintilla/pkg/PLIST editors/py-qscintilla/pkg/PLIST
index fe4a5d6841d..efcb8e53137 100644
--- editors/py-qscintilla/pkg/PLIST
+++ editors/py-qscintilla/pkg/PLIST
@@ -1,6 +1,6 @@
@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
+@so 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
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
