Re: UPDATE: editors/{,py-}qscintilla 2.11.1

2019-05-31 Thread Landry Breuil
On Fri, May 31, 2019 at 08:08:34PM +0200, Landry Breuil wrote:
> On Fri, May 31, 2019 at 07:56:02PM +0200, Caspar Schutijser wrote:
> > Hi ports@,
> > 
> > Below is a diff that updates editors/{,py-}qscintilla to 2.11.1. I have
> > identified a number of ports that depend on {,py-}qscintilla. I
> > build-tested all of them and I run-tested some of them.
> 
> Fwiw if you go down that road, might aswell have a look at pyqt5 and
> py-sip, it's best to usually update all the things coming from this
> upstream altogether - we're badly lagging behind on py-qt5, but it might
> not be an easy task at all :)

Bah, spoke too fast, we have pyqt 5.9 because qt 5.9. Still py-sip is
lagging behind a bit :)

Landry



Re: UPDATE: editors/{,py-}qscintilla 2.11.1

2019-05-31 Thread Landry Breuil
On Fri, May 31, 2019 at 07:56:02PM +0200, Caspar Schutijser wrote:
> Hi ports@,
> 
> Below is a diff that updates editors/{,py-}qscintilla to 2.11.1. I have
> identified a number of ports that depend on {,py-}qscintilla. I
> build-tested all of them and I run-tested some of them.

Fwiw if you go down that road, might aswell have a look at pyqt5 and
py-sip, it's best to usually update all the things coming from this
upstream altogether - we're badly lagging behind on py-qt5, but it might
not be an easy task at all :)

Landry



UPDATE: editors/{,py-}qscintilla 2.11.1

2019-05-31 Thread Caspar Schutijser
Hi ports@,

Below is a diff that updates editors/{,py-}qscintilla to 2.11.1. I have
identified a number of ports that depend on {,py-}qscintilla. I
build-tested all of them and I run-tested some of them.

I build-tested the following ports that depend on {,py-}qscintilla:
cad/openscad
databases/sqliteman
geo/qgis
x11/kde4/p5-qt
x11/kde4/qyoto
x11/kde4/ruby-qt
x11/kde4/smokeqt

In the case of the ports below, I did not only build-test them, I also
performed some run-time testing:
databases/sqlitebrowser
devel/tortoisehg
math/octave (very light testing)

All testing was done on amd64. I'd appreciate feedback on the diff.

Thanks,
Caspar Schutijser


Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- editors/py-qscintilla/Makefile  28 Apr 2019 20:51:40 -  1.18
+++ editors/py-qscintilla/Makefile  31 May 2019 17:46:58 -
@@ -2,18 +2,17 @@
 
 COMMENT =  Python binding for the Scintilla source code editor
 
-VERSION =  2.10.1
+VERSION =  2.11.1
 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_CDROM = Yes
 
-MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =  
https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.1/
 
 MODULES = lang/python
 FLAVORS = qt5
Index: editors/py-qscintilla/distinfo
===
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- editors/py-qscintilla/distinfo  30 Oct 2017 13:51:17 -  1.5
+++ editors/py-qscintilla/distinfo  31 May 2019 17:46:58 -
@@ -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.1.tar.gz) = 
2uVNGeQ9ulo/mKwIT8C8+m+3E/qFHxeDoBQEOX/XIvU=
+SIZE (QScintilla_gpl-2.11.1.tar.gz) = 2932060
Index: editors/py-qscintilla/pkg/PLIST
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- editors/py-qscintilla/pkg/PLIST 20 May 2018 08:30:21 -  1.5
+++ editors/py-qscintilla/pkg/PLIST 31 May 2019 17:46:58 -
@@ -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.1.dist-info/
+lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.1.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.1.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.1.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
Index: editors/qscintilla/Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- editors/qscintilla/Makefile 22 Dec 2017 06:27:16 -  1.22
+++ editors/qscintilla/Makefile 31 May 2019 17:46:58 -
@@ -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.1
 DISTNAME = QScintilla_gpl-${VERSION}
 PKGNAME =  qscintilla-${VERSION}
-REVISION = 0
 CATEGORIES =   editors x11
 
 
@@ -15,7 +14,7 @@ HOMEPAGE =http://www.riverbankcomputing
 # GPLv2/GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =  
https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.1/
 
 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: editors/qscintilla/distinfo
==