Hi,
while trying to debug issues i'm seeing in qgis, took the liberty to
update the python ports coming from riverbankcomputing.com, ie py-sip,
py-qt5 (py-qt4 is already at the latest), qscintilla and py-qscintilla.
As always, anything depending/using sip breaks at every API update, so
if you use anything that depends on it directly or indirectly, make sure
you runtime-test them.. ie tortoisehg, git-cola, hgview, calibre,
picard, puddletag, py-kde, kate...... i'm rebuilding qgis with all those
updated right now.
I wonder if py-qt4 shouldnt get a REVISION bump to force its update.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 20 Mar 2016 16:12:23 -0000 1.30
+++ Makefile 9 Aug 2016 09:47:25 -0000
@@ -5,7 +5,7 @@
# XXX Be particularly careful when testing updates.
# API breaks often.
-DISTNAME= sip-4.16.8
+DISTNAME= sip-4.18.1
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 26 Jun 2015 13:03:36 -0000 1.14
+++ distinfo 9 Aug 2016 09:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-4.16.8.tar.gz) = 0xQbZeSKMMnONmEvi80XMOvwLQRHV+TWxSNJJ+IGPhg=
-SIZE (sip-4.16.8.tar.gz) = 957083
+SHA256 (sip-4.18.1.tar.gz) = m856Lb9/EFv2itG6tY7rwM4zCH7EA5badWRj8Ib/opA=
+SIZE (sip-4.18.1.tar.gz) = 992624
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 26 Jun 2015 13:03:36 -0000 1.6
+++ pkg/PLIST 9 Aug 2016 09:47:25 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2015/06/26 13:03:36 ajacoutot Exp $
@bin bin/sip
include/python${MODPY_VERSION}/sip.h
+lib/python${MODPY_VERSION}/site-packages/sip.pyi
lib/python${MODPY_VERSION}/site-packages/sip.so
lib/python${MODPY_VERSION}/site-packages/sipconfig.py
lib/python${MODPY_VERSION}/site-packages/sipconfig.pyc
? qscintilla-2.8-libqscintilla2.so.4.0
? qscintilla-2.9.3-libqscintilla2.so.4.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 26 Mar 2016 20:37:35 -0000 1.14
+++ Makefile 9 Aug 2016 09:47:08 -0000
@@ -3,12 +3,12 @@
COMMENT = Qt4 port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.8
-DISTNAME = QScintilla-gpl-${VERSION}
+VERSION = 2.9.3
+DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = qscintilla-${VERSION}
CATEGORIES = editors x11
-SHARED_LIBS = qscintilla2 4.0
+SHARED_LIBS = qscintilla2 5.0
HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 10 Nov 2013 22:23:43 -0000 1.5
+++ distinfo 9 Aug 2016 09:47:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.8.tar.gz) =
QdMq9xUBvf38BmjzBLp9fBUBlGJ5XpRB07I/wFT9+3E=
-SIZE (QScintilla-gpl-2.8.tar.gz) = 2917864
+SHA256 (QScintilla_gpl-2.9.3.tar.gz) =
mKq5PXOwVjWGfC/HV6yzg7WFagtBbj/XZZ8YeZlt234=
+SIZE (QScintilla_gpl-2.9.3.tar.gz) = 2503568
Index: patches/patch-Qt4Qt5_qscintilla_pro
===================================================================
RCS file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.2
diff -u -r1.2 patch-Qt4Qt5_qscintilla_pro
--- patches/patch-Qt4Qt5_qscintilla_pro 10 Nov 2013 22:23:43 -0000 1.2
+++ patches/patch-Qt4Qt5_qscintilla_pro 9 Aug 2016 09:47:08 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Qt4Qt5_qscintilla_pro,v 1.2 2013/11/10 22:23:43 sthen Exp $
---- Qt4Qt5/qscintilla.pro.orig Fri Nov 8 15:31:02 2013
-+++ Qt4Qt5/qscintilla.pro Sun Nov 10 21:48:25 2013
+--- Qt4Qt5/qscintilla.pro.orig Mon Jul 25 16:13:58 2016
++++ Qt4Qt5/qscintilla.pro Tue Aug 9 10:32:10 2016
@@ -47,7 +47,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+ # Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
- # Handle both Qt v4 and v3.
-target.path = $$[QT_INSTALL_LIBS]
+target.path = ${LOCALBASE}/lib
- isEmpty(target.path) {
- target.path = $(QTDIR)/lib
- }
+ INSTALLS += target
+
+ header.path = $$[QT_INSTALL_HEADERS]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 10 Nov 2013 21:44:02 -0000 1.4
+++ pkg/PLIST 9 Aug 2016 09:47:08 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2013/11/10 21:44:02 sthen Exp $
-include/X11/qt4/
include/X11/qt4/Qsci/
include/X11/qt4/Qsci/qsciabstractapis.h
include/X11/qt4/Qsci/qsciapis.h
@@ -8,9 +7,11 @@
include/X11/qt4/Qsci/qscidocument.h
include/X11/qt4/Qsci/qsciglobal.h
include/X11/qt4/Qsci/qscilexer.h
+include/X11/qt4/Qsci/qscilexeravs.h
include/X11/qt4/Qsci/qscilexerbash.h
include/X11/qt4/Qsci/qscilexerbatch.h
include/X11/qt4/Qsci/qscilexercmake.h
+include/X11/qt4/Qsci/qscilexercoffeescript.h
include/X11/qt4/Qsci/qscilexercpp.h
include/X11/qt4/Qsci/qscilexercsharp.h
include/X11/qt4/Qsci/qscilexercss.h
@@ -29,6 +30,7 @@
include/X11/qt4/Qsci/qscilexeroctave.h
include/X11/qt4/Qsci/qscilexerpascal.h
include/X11/qt4/Qsci/qscilexerperl.h
+include/X11/qt4/Qsci/qscilexerpo.h
include/X11/qt4/Qsci/qscilexerpostscript.h
include/X11/qt4/Qsci/qscilexerpov.h
include/X11/qt4/Qsci/qscilexerproperties.h
@@ -49,7 +51,7 @@
include/X11/qt4/Qsci/qscistyle.h
include/X11/qt4/Qsci/qscistyledtext.h
@lib lib/libqscintilla2.so.${LIBqscintilla2_VERSION}
-lib/qt4/
+lib/qt4/mkspecs/features/qscintilla2.prf
lib/qt4/qsci/
lib/qt4/qsci/api/
lib/qt4/qsci/api/python/
@@ -60,10 +62,10 @@
lib/qt4/qsci/api/python/Python-3.1.api
lib/qt4/qsci/api/python/Python-3.2.api
lib/qt4/qsci/api/python/Python-3.3.api
-lib/qt4/translations/
+lib/qt4/qsci/api/python/Python-3.4.api
+lib/qt4/qsci/api/python/Python-3.5.api
lib/qt4/translations/qscintilla_cs.qm
lib/qt4/translations/qscintilla_de.qm
lib/qt4/translations/qscintilla_es.qm
lib/qt4/translations/qscintilla_fr.qm
lib/qt4/translations/qscintilla_pt_br.qm
-lib/qt4/translations/qscintilla_ru.qm
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 20 Mar 2016 16:12:27 -0000 1.3
+++ Makefile 9 Aug 2016 09:46:52 -0000
@@ -3,12 +3,11 @@
COMMENT-main= python Qt5 bindings
COMMENT-docs= py-qt5 documentation
-V= 5.5.1
-DISTNAME= PyQt-gpl-${V}
+V= 5.7
+DISTNAME= PyQt5_gpl-${V}
PKGNAME= py-qt5-${V}
PKGNAME-main= py-qt5-${V}
PKGNAME-docs= py-qt5-docs-${V}
-REVISION-main= 0
CATEGORIES= x11 devel
@@ -34,7 +33,7 @@
PKG_ARCH-docs= *
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/py-sip>=4.16.5 \
+RUN_DEPENDS= devel/py-sip>=4.18.1 \
x11/dbus-python
LIB_DEPENDS= ${MODQT5_LIB_DEPENDS}>=5.5 \
${MODPY_LIB_DEPENDS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 26 Nov 2015 00:32:31 -0000 1.1.1.1
+++ distinfo 9 Aug 2016 09:46:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt-gpl-5.5.1.tar.gz) = CnDvlPv/z2dLDd4CSq4qKno/WoxCgGEJ/33yyUG9g4Y=
-SIZE (PyQt-gpl-5.5.1.tar.gz) = 3705749
+SHA256 (PyQt5_gpl-5.7.tar.gz) = iSaTul95mJq7IGHa0tXE5vEn6d0yQPc/giDHFSzTWwU=
+SIZE (PyQt5_gpl-5.7.tar.gz) = 3729111
Index: patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt5/patches/patch-configure_py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure_py
--- patches/patch-configure_py 26 Nov 2015 00:32:31 -0000 1.1.1.1
+++ patches/patch-configure_py 9 Aug 2016 09:46:52 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_py,v 1.1.1.1 2015/11/26 00:32:31 sthen Exp $
---- configure.py.orig Sun Oct 25 11:42:16 2015
-+++ configure.py Sun Nov 22 21:12:58 2015
-@@ -1953,7 +1953,18 @@ def run_command(cmd, verbose):
+--- configure.py.orig Mon Jul 25 15:55:28 2016
++++ configure.py Tue Aug 9 07:49:53 2016
+@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
""" Run a command and display the output if requested. cmd is the command
to run. verbose is set if the output is to be displayed.
"""
@@ -20,7 +20,7 @@
if verbose:
sys.stdout.write(cmd + "\n")
-@@ -2652,7 +2663,7 @@ Type 'no' to decline the terms of the license.
+@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 4 Apr 2015 09:21:01 -0000 1.8
+++ Makefile 9 Aug 2016 09:47:02 -0000
@@ -2,11 +2,10 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.8
-DISTNAME = QScintilla-gpl-${VERSION}
+VERSION = 2.9.3
+DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
-REVISION = 0
HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 10 Nov 2013 22:23:43 -0000 1.3
+++ distinfo 9 Aug 2016 09:47:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.8.tar.gz) =
QdMq9xUBvf38BmjzBLp9fBUBlGJ5XpRB07I/wFT9+3E=
-SIZE (QScintilla-gpl-2.8.tar.gz) = 2917864
+SHA256 (QScintilla_gpl-2.9.3.tar.gz) =
mKq5PXOwVjWGfC/HV6yzg7WFagtBbj/XZZ8YeZlt234=
+SIZE (QScintilla_gpl-2.9.3.tar.gz) = 2503568
Index: patches/patch-Python_configure_py
===================================================================
RCS file: patches/patch-Python_configure_py
diff -N patches/patch-Python_configure_py
--- patches/patch-Python_configure_py 14 Aug 2014 22:35:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Python_configure_py,v 1.1 2014/08/14 22:35:00 zhuk Exp $
-Use actual found qmake binary path instead of hardcoded one.
---- Python/configure.py.orig Fri Aug 1 13:05:13 2014
-+++ Python/configure.py Fri Aug 1 13:05:57 2014
-@@ -635,7 +635,7 @@ def generate_code(target_config, opts):
- # Generate the Makefile.
- inform("Creating the Makefile for the Qsci module...")
-
-- qmake_args = ['qmake']
-+ qmake_args = [target_config.qmake]
- if target_config.qmake_spec != '':
- qmake_args.append('-spec')
- qmake_args.append(target_config.qmake_spec)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 8 Nov 2013 22:38:14 -0000 1.2
+++ pkg/PLIST 9 Aug 2016 09:47:02 -0000
@@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2013/11/08 22:38:14 sthen Exp $
+lib/python${MODPY_VERSION}/site-packages/PyQt4/Qsci.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt4/Qsci.so
-lib/qt4/api/
-lib/qt4/api/python/
-lib/qt4/api/python/QScintilla2.api
+lib/qt4/qsci/api/python/QScintilla2.api
share/sip/Qsci/
share/sip/Qsci/qsciabstractapis.sip
share/sip/Qsci/qsciapis.sip
@@ -10,9 +9,11 @@
share/sip/Qsci/qscicommandset.sip
share/sip/Qsci/qscidocument.sip
share/sip/Qsci/qscilexer.sip
+share/sip/Qsci/qscilexeravs.sip
share/sip/Qsci/qscilexerbash.sip
share/sip/Qsci/qscilexerbatch.sip
share/sip/Qsci/qscilexercmake.sip
+share/sip/Qsci/qscilexercoffeescript.sip
share/sip/Qsci/qscilexercpp.sip
share/sip/Qsci/qscilexercsharp.sip
share/sip/Qsci/qscilexercss.sip
@@ -31,6 +32,7 @@
share/sip/Qsci/qscilexeroctave.sip
share/sip/Qsci/qscilexerpascal.sip
share/sip/Qsci/qscilexerperl.sip
+share/sip/Qsci/qscilexerpo.sip
share/sip/Qsci/qscilexerpostscript.sip
share/sip/Qsci/qscilexerpov.sip
share/sip/Qsci/qscilexerproperties.sip
@@ -45,13 +47,11 @@
share/sip/Qsci/qscilexerxml.sip
share/sip/Qsci/qscilexeryaml.sip
share/sip/Qsci/qscimacro.sip
-share/sip/Qsci/qscimod3.sip
share/sip/Qsci/qscimod4.sip
share/sip/Qsci/qscimod5.sip
share/sip/Qsci/qscimodcommon.sip
share/sip/Qsci/qsciprinter.sip
share/sip/Qsci/qsciscintilla.sip
-share/sip/Qsci/qsciscintillabase3.sip
-share/sip/Qsci/qsciscintillabase4.sip
+share/sip/Qsci/qsciscintillabase.sip
share/sip/Qsci/qscistyle.sip
share/sip/Qsci/qscistyledtext.sip
