On Mon, Feb 17, 2020 at 09:47:04AM +0100, Landry Breuil wrote:
> 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.
>
> I like that, but can you incorporate the 2.11.4 update i sent to ports
> last week ? might aswell do both in one go...
here's the 2.11.4 update applied on top of your diff.
? qsc
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 24 Jul 2019 08:50:19 -0000 1.20
+++ Makefile 17 Feb 2020 08:50:38 -0000
@@ -2,66 +2,51 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.11.2
-DISTNAME = QScintilla_gpl-${VERSION}
-PKGNAME = py-qscintilla-${VERSION}
+VERSION = 2.11.4
+MODPY_EGG_VERSION = ${VERSION}
+DISTNAME = QScintilla-${VERSION}
+PKGNAME = py-${DISTNAME:L}
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 24 Jul 2019 08:50:19 -0000 1.6
+++ distinfo 17 Feb 2020 08:50:38 -0000
@@ -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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 24 Jul 2019 08:50:19 -0000 1.6
+++ pkg/PLIST 17 Feb 2020 08:50:38 -0000
@@ -1,10 +1,10 @@
@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
+@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
lib/${QTVER}/qsci/api/python/QScintilla2.api
${SIPDIR}/Qsci/
${SIPDIR}/Qsci/qsciabstractapis.sip
