On Sun, Jul 21, 2019 at 02:02:00PM +0200, Landry Breuil wrote:
> On the diff itself, dependency between py- and the lib should be
> enforced, otherwise you get this:
>
> Error: QScintilla 2.10.1 is being used but the Python bindings 2.11.2
> are being built. Please use matching versions.
>
> LIB_DEPENDS = editors/qscintilla,qt5>=2.11.2 (and its equivalent for the
> default FLAVOR, and maybe even = and not >= ) in py-qscintilla Makefile
> does the trick.
>
> Landry
That's a very good point indeed, thank you. Below is a diff that
addresses your feedback. I choose to depend on
editors/qscintilla,qt5=${VERSION} so those lines doesn't have to be
adjusted with every update.
Thanks,
Caspar Schutijser
Index: qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- qscintilla/Makefile 12 Jul 2019 20:46:06 -0000 1.23
+++ qscintilla/Makefile 21 Jul 2019 13:10:54 -0000
@@ -3,10 +3,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.10.1
+VERSION = 2.11.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = qscintilla-${VERSION}
-REVISION = 0
CATEGORIES = editors x11
@@ -15,7 +14,7 @@ HOMEPAGE = http://www.riverbankcomputing
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
WANTLIB = ${COMPILER_LIBCXX} m
MODULES = devel/qmake
@@ -30,13 +29,13 @@ CXXFLAGS += -std=c++11
FULLPKGNAME = qscintilla-qt5-${VERSION}
QTVER = qt5
MODULES += x11/qt5
-SHARED_LIBS = qscintilla2_qt5 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt5 1.0 # 15.0
WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
.else
QTVER = qt4
MODULES += x11/qt4
-SHARED_LIBS = qscintilla2_qt4 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt4 1.0 # 15.0
WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
WANTLIB += freetype pthread
Index: qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- qscintilla/distinfo 30 Oct 2017 13:49:31 -0000 1.7
+++ qscintilla/distinfo 21 Jul 2019 13:10:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
+SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
Index: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
===================================================================
RCS file: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
diff -N qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h 21 Jul 2019
13:10:54 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: Qt4Qt5/Qsci/qsciscintillabase.h
+--- Qt4Qt5/Qsci/qsciscintillabase.h.orig
++++ Qt4Qt5/Qsci/qsciscintillabase.h
+@@ -26,6 +26,7 @@
+ #include <QAbstractScrollArea>
+ #include <QByteArray>
+ #include <QPoint>
++#include <QUrl>
+ #include <QTimer>
+
+ #include <Qsci/qsciglobal.h>
+@@ -37,7 +38,6 @@ class QImage;
+ class QMimeData;
+ class QPainter;
+ class QPixmap;
+-class QUrl;
+ QT_END_NAMESPACE
+
+ class QsciScintillaQt;
Index: qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
===================================================================
RCS file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Qt4Qt5_qscintilla_pro
--- qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 30 Oct 2017 13:49:31
-0000 1.4
+++ qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 21 Jul 2019 13:10:54
-0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Qt4Qt5_qscintilla_pro,v
Index: Qt4Qt5/qscintilla.pro
--- Qt4Qt5/qscintilla.pro.orig
+++ Qt4Qt5/qscintilla.pro
-@@ -66,7 +66,7 @@ unix:!macx {
+@@ -68,7 +68,7 @@ unix:!macx {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
Index: qscintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- qscintilla/pkg/PLIST 30 Oct 2017 13:49:31 -0000 1.6
+++ qscintilla/pkg/PLIST 21 Jul 2019 13:10:54 -0000
@@ -18,6 +18,7 @@ include/X11/${QTVER}/Qsci/qscilexercss.h
include/X11/${QTVER}/Qsci/qscilexercustom.h
include/X11/${QTVER}/Qsci/qscilexerd.h
include/X11/${QTVER}/Qsci/qscilexerdiff.h
+include/X11/${QTVER}/Qsci/qscilexeredifact.h
include/X11/${QTVER}/Qsci/qscilexerfortran.h
include/X11/${QTVER}/Qsci/qscilexerfortran77.h
include/X11/${QTVER}/Qsci/qscilexerhtml.h
@@ -67,6 +68,8 @@ lib/${QTVER}/qsci/api/python/Python-3.3.
lib/${QTVER}/qsci/api/python/Python-3.4.api
lib/${QTVER}/qsci/api/python/Python-3.5.api
lib/${QTVER}/qsci/api/python/Python-3.6.api
+lib/${QTVER}/qsci/api/python/Python-3.7.api
+lib/${QTVER}/qsci/api/python/Python-3.8.api
lib/${QTVER}/translations/qscintilla_cs.qm
lib/${QTVER}/translations/qscintilla_de.qm
lib/${QTVER}/translations/qscintilla_es.qm
Index: py-qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- py-qscintilla/Makefile 12 Jul 2019 20:46:06 -0000 1.19
+++ py-qscintilla/Makefile 21 Jul 2019 13:10:54 -0000
@@ -2,18 +2,17 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.10.1
+VERSION = 2.11.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
-REVISION = 3
HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
MODULES = lang/python
FLAVORS = qt5
@@ -42,7 +41,7 @@ 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
+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
@@ -52,7 +51,7 @@ SIPDIR= share/sip
PYQTVER = PyQt4
RUN_DEPENDS += x11/py-qt4
MODULES += x11/qt4
-LIB_DEPENDS = editors/qscintilla
+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
Index: py-qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- py-qscintilla/distinfo 30 Oct 2017 13:51:17 -0000 1.5
+++ py-qscintilla/distinfo 21 Jul 2019 13:10:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
+SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
Index: py-qscintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- py-qscintilla/pkg/PLIST 20 May 2018 08:30:21 -0000 1.5
+++ py-qscintilla/pkg/PLIST 21 Jul 2019 13:10:54 -0000
@@ -1,6 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2018/05/20 08:30:21 espie 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
@@ -20,6 +24,7 @@ ${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
