Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-11 Thread Landry Breuil 
Le Sun, Feb 11, 2024 at 02:34:35PM +0100, Rafael Sadowski a écrit :
> On Fri Feb 09, 2024 at 08:02:41PM +0100, Landry Breuil wrote:
> > Le Fri, Feb 09, 2024 at 10:26:18AM +, Stuart Henderson a écrit :
> > > On 2024/02/09 10:14, Stuart Henderson wrote:
> > > > Is the "remove qtwebkit" approach because it's causing an actual
> > > > problem, or is it just that it's old? Can we switch to qtwebengine where
> > > > possible but still keep qtwebkit for things where it's still needed
> > > > for certain software to work properly? Rendering local HTML files isn't
> > > > a particularly high security risk.
> > > > 
> > > > Regarding qgis, it seems they _can't_ use qtwebengine:
> > > > https://github.com/qgis/QGIS/issues/49512#issuecomment-1244676849
> > > 
> > > Aha - there is https://github.com/qgis/QGIS/pull/53255 which has
> > > been merged into git master, so this requirement might go away soon.
> > 
> > yes, and https://github.com/qgis/QGIS/pull/55627 starts paving the way
> > for qtwebengine - at some point qgis will switch to qt6 which doesnt
> > have qtwebkit, so qtwebengine support will have to come (as
> > https://github.com/qgis/QGIS/issues/54965 said, with things that might
> > not be possible yet...)
> 
> It is confusing to follow all these PRs as a release note.
> 
> > 
> > but i can readd the dep on qtwebkit if it's here to stay in the
> > portstree a little longer :)
> > 
> 
> I have spoken to Stuart, we will stay with qtwebkit until qgis is ready.
> Can you keep an eye on it?

sure, i'll make sure to switch to qt6 and to qtwebengine as soon as
upstream deems it 'ready' :)

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-11 Thread Rafael Sadowski 
On Fri Feb 09, 2024 at 08:02:41PM +0100, Landry Breuil wrote:
> Le Fri, Feb 09, 2024 at 10:26:18AM +, Stuart Henderson a écrit :
> > On 2024/02/09 10:14, Stuart Henderson wrote:
> > > Is the "remove qtwebkit" approach because it's causing an actual
> > > problem, or is it just that it's old? Can we switch to qtwebengine where
> > > possible but still keep qtwebkit for things where it's still needed
> > > for certain software to work properly? Rendering local HTML files isn't
> > > a particularly high security risk.
> > > 
> > > Regarding qgis, it seems they _can't_ use qtwebengine:
> > > https://github.com/qgis/QGIS/issues/49512#issuecomment-1244676849
> > 
> > Aha - there is https://github.com/qgis/QGIS/pull/53255 which has
> > been merged into git master, so this requirement might go away soon.
> 
> yes, and https://github.com/qgis/QGIS/pull/55627 starts paving the way
> for qtwebengine - at some point qgis will switch to qt6 which doesnt
> have qtwebkit, so qtwebengine support will have to come (as
> https://github.com/qgis/QGIS/issues/54965 said, with things that might
> not be possible yet...)

It is confusing to follow all these PRs as a release note.

> 
> but i can readd the dep on qtwebkit if it's here to stay in the
> portstree a little longer :)
> 

I have spoken to Stuart, we will stay with qtwebkit until qgis is ready.
Can you keep an eye on it?

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-09 Thread Landry Breuil 
Le Fri, Feb 09, 2024 at 10:26:18AM +, Stuart Henderson a écrit :
> On 2024/02/09 10:14, Stuart Henderson wrote:
> > Is the "remove qtwebkit" approach because it's causing an actual
> > problem, or is it just that it's old? Can we switch to qtwebengine where
> > possible but still keep qtwebkit for things where it's still needed
> > for certain software to work properly? Rendering local HTML files isn't
> > a particularly high security risk.
> > 
> > Regarding qgis, it seems they _can't_ use qtwebengine:
> > https://github.com/qgis/QGIS/issues/49512#issuecomment-1244676849
> 
> Aha - there is https://github.com/qgis/QGIS/pull/53255 which has
> been merged into git master, so this requirement might go away soon.

yes, and https://github.com/qgis/QGIS/pull/55627 starts paving the way
for qtwebengine - at some point qgis will switch to qt6 which doesnt
have qtwebkit, so qtwebengine support will have to come (as
https://github.com/qgis/QGIS/issues/54965 said, with things that might
not be possible yet...)

but i can readd the dep on qtwebkit if it's here to stay in the
portstree a little longer :)

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-09 Thread Stuart Henderson 
On 2024/02/09 10:14, Stuart Henderson wrote:
> Is the "remove qtwebkit" approach because it's causing an actual
> problem, or is it just that it's old? Can we switch to qtwebengine where
> possible but still keep qtwebkit for things where it's still needed
> for certain software to work properly? Rendering local HTML files isn't
> a particularly high security risk.
> 
> Regarding qgis, it seems they _can't_ use qtwebengine:
> https://github.com/qgis/QGIS/issues/49512#issuecomment-1244676849

Aha - there is https://github.com/qgis/QGIS/pull/53255 which has
been merged into git master, so this requirement might go away soon.

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-09 Thread Stuart Henderson 
Is the "remove qtwebkit" approach because it's causing an actual
problem, or is it just that it's old? Can we switch to qtwebengine where
possible but still keep qtwebkit for things where it's still needed
for certain software to work properly? Rendering local HTML files isn't
a particularly high security risk.

Regarding qgis, it seems they _can't_ use qtwebengine:
https://github.com/qgis/QGIS/issues/49512#issuecomment-1244676849


On 2024/02/09 08:44, Landry Breuil wrote:
> Le Fri, Feb 09, 2024 at 08:19:12AM +0100, Landry Breuil a écrit :
> > Le Thu, Feb 08, 2024 at 09:06:44PM +0100, Rafael Sadowski a écrit :
> > > On Thu Feb 08, 2024 at 07:54:26PM +0100, Landry Breuil wrote:
> > > > Le Thu, Feb 08, 2024 at 03:12:17PM +0100, Rafael Sadowski a écrit :
> > > > > Here is a simple diff to remove qtwebkit from. I modified configure.py
> > > > > to make sure it will not picked up even it is present.
> > > > > 
> > > > > OK?
> > > > 
> > > > obvious question, but all the runtime consumers of py-qt5 been checked
> > > > for not actually relying on qtwebkit ?
> > > > 
> > > 
> > > I have prep'ed for webkit in all ports that use py-qt5.
> > > 
> > > What I see with my 99 years python experience:
> > > 
> > > - lots of "webkit" in qutebrowser, but it runs with py-qtwebengine and
> > >   that's all css -webkit hacks.
> > > - calibre and everything else looks good to me.
> > > - I don't know if qgis parts are relevant
> > 
> > the qgis bits look to be for a bundled copy of it.. i havent tried
> > runtime yet with qtwebkit disabled, but from what i've understood from
> > some gh issues/PR identifying objects on layers with html format should
> > still work.
> 
> now that i've tested 3.34.3p1, HTML query on features is rendered as
> plaintext, so i guess there's some kind of fallback
> mechanism/conversion.. not great, but i can live with that.
> 
> after some time i'll see what other features might be degraded.
>

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-08 Thread Landry Breuil 
Le Fri, Feb 09, 2024 at 08:19:12AM +0100, Landry Breuil a écrit :
> Le Thu, Feb 08, 2024 at 09:06:44PM +0100, Rafael Sadowski a écrit :
> > On Thu Feb 08, 2024 at 07:54:26PM +0100, Landry Breuil wrote:
> > > Le Thu, Feb 08, 2024 at 03:12:17PM +0100, Rafael Sadowski a écrit :
> > > > Here is a simple diff to remove qtwebkit from. I modified configure.py
> > > > to make sure it will not picked up even it is present.
> > > > 
> > > > OK?
> > > 
> > > obvious question, but all the runtime consumers of py-qt5 been checked
> > > for not actually relying on qtwebkit ?
> > > 
> > 
> > I have prep'ed for webkit in all ports that use py-qt5.
> > 
> > What I see with my 99 years python experience:
> > 
> > - lots of "webkit" in qutebrowser, but it runs with py-qtwebengine and
> >   that's all css -webkit hacks.
> > - calibre and everything else looks good to me.
> > - I don't know if qgis parts are relevant
> 
> the qgis bits look to be for a bundled copy of it.. i havent tried
> runtime yet with qtwebkit disabled, but from what i've understood from
> some gh issues/PR identifying objects on layers with html format should
> still work.

now that i've tested 3.34.3p1, HTML query on features is rendered as
plaintext, so i guess there's some kind of fallback
mechanism/conversion.. not great, but i can live with that.

after some time i'll see what other features might be degraded.

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-08 Thread Landry Breuil 
Le Thu, Feb 08, 2024 at 09:06:44PM +0100, Rafael Sadowski a écrit :
> On Thu Feb 08, 2024 at 07:54:26PM +0100, Landry Breuil wrote:
> > Le Thu, Feb 08, 2024 at 03:12:17PM +0100, Rafael Sadowski a écrit :
> > > Here is a simple diff to remove qtwebkit from. I modified configure.py
> > > to make sure it will not picked up even it is present.
> > > 
> > > OK?
> > 
> > obvious question, but all the runtime consumers of py-qt5 been checked
> > for not actually relying on qtwebkit ?
> > 
> 
> I have prep'ed for webkit in all ports that use py-qt5.
> 
> What I see with my 99 years python experience:
> 
> - lots of "webkit" in qutebrowser, but it runs with py-qtwebengine and
>   that's all css -webkit hacks.
> - calibre and everything else looks good to me.
> - I don't know if qgis parts are relevant

the qgis bits look to be for a bundled copy of it.. i havent tried
runtime yet with qtwebkit disabled, but from what i've understood from
some gh issues/PR identifying objects on layers with html format should
still work.

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-08 Thread Rafael Sadowski 
On Thu Feb 08, 2024 at 07:54:26PM +0100, Landry Breuil wrote:
> Le Thu, Feb 08, 2024 at 03:12:17PM +0100, Rafael Sadowski a écrit :
> > Here is a simple diff to remove qtwebkit from. I modified configure.py
> > to make sure it will not picked up even it is present.
> > 
> > OK?
> 
> obvious question, but all the runtime consumers of py-qt5 been checked
> for not actually relying on qtwebkit ?
> 

I have prep'ed for webkit in all ports that use py-qt5.

What I see with my 99 years python experience:

- lots of "webkit" in qutebrowser, but it runs with py-qtwebengine and
  that's all css -webkit hacks.
- calibre and everything else looks good to me.
- I don't know if qgis parts are relevant
- Could be a issue:
  pobj/fs-uae-launcher-3.1.68/fs-uae-launcher-3.1.68/fsui/qt/web_view.py:from 
PyQt5.QtWebKitWidgets import QWebView
  FreeBSD ships the same version without having webkit.

Thoughts?


pobj/py-qtpy-2.4.0-python3/QtPy-2.4.0/qtpy/QtWebEngineWidgets.py:# To test if 
we are using WebEngine or WebKit
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  webkit_version='537.36',
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  # QtWebKit
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  "AppleWebKit/537.36 (KHTML, like Gecko) "
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  # Not available with QtWebKit
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:
with_webkit: bool = True
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:
VersionParams('no-webkit', with_webkit=False),
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:
if params.with_webkit:
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  patches['qWebKitVersion'] = lambda: 'WEBKIT VERSION'
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  patches['objects.backend'] = usertypes.Backend.QtWebKit
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  substitutions['backend'] = 'new QtWebKit (WebKit WEBKIT VERSION)'
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_version.py:  
  monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False)
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:
('537.21', False),  # QtWebKit 5.1
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:
('602.1', True) # new QtWebKit TP5, 5.212 Alpha
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:def 
test_is_new_qtwebkit(monkeypatch, version, is_new):
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:
monkeypatch.setattr(qtutils, 'qWebKitVersion', lambda: version)
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:
assert qtutils.is_new_qtwebkit() == is_new
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_qtutils.py:
(usertypes.Backend.QtWebKit, ['--single-process'], False),
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_javascript.py:   
 webkit_only: bool = False
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_javascript.py:   
 Case('\x00', r'\x00', webkit_only=True),
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_javascript.py:   
 Case('\x00\x00', r'\x00\x00', webkit_only=True),
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_javascript.py:   
 Case('\ufeff', r'\ufeff', webkit_only=True),
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_javascript.py:   
 if web_tab.backend == usertypes.Backend.QtWebEngine and case.webkit_only:
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/utils/test_debug.py:
qwebpage = pytest.importorskip("qutebrowser.qt.webkitwidgets").QWebPage
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/misc/test_sessions.py:QWebView
 = pytest.importorskip('qutebrowser.qt.webkitwidgets').QWebView
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/misc/test_sessions.py:from 
qutebrowser.browser.webkit import tabhistory
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/mainwindow/test_tabwidget.py:
usertypes.Backend.QtWebKit)
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/javascript/test_js_execution.py:def
 test_simple_js_webkit(webview, js_enabled, expected):
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/javascript/test_js_execution.py:
"""With QtWebKit, evaluateJavaScript works when JS is on."""
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/javascript/test_js_execution.py:
# QtWebKit is available
pobj/qutebrowser-3.0.2/qutebrowser-3.0.2/tests/unit/javascript/test_js_execution.py:
fr

Re: remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-08 Thread Landry Breuil 
Le Thu, Feb 08, 2024 at 03:12:17PM +0100, Rafael Sadowski a écrit :
> Here is a simple diff to remove qtwebkit from. I modified configure.py
> to make sure it will not picked up even it is present.
> 
> OK?

obvious question, but all the runtime consumers of py-qt5 been checked
for not actually relying on qtwebkit ?

remove x11/qt5/qtwebkit from x11/py-qt5

2024-02-08 Thread Rafael Sadowski 
Here is a simple diff to remove qtwebkit from. I modified configure.py
to make sure it will not picked up even it is present.

OK?

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index e122384c90f..8848bfd29e5 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -5,7 +5,7 @@ DPB_PROPERTIES= parallel
 MODPY_EGG_VERSION= 5.15.9
 DISTNAME=  PyQt5-${MODPY_EGG_VERSION}
 PKGNAME=   py-qt5-${MODPY_EGG_VERSION}
-REVISION=  1
+REVISION=  2
 
 CATEGORIES=x11 devel
 
@@ -21,9 +21,8 @@ WANTLIB += Qt5MultimediaWidgets Qt5Network Qt5Nfc Qt5OpenGL 
Qt5Positioning
 WANTLIB += Qt5PositioningQuick Qt5PrintSupport Qt5Qml Qt5QmlModels
 WANTLIB += Qt5Quick Qt5QuickWidgets Qt5RemoteObjects Qt5Sensors
 WANTLIB += Qt5SerialPort Qt5Sql Qt5Svg Qt5Test Qt5TextToSpeech
-WANTLIB += Qt5WebChannel Qt5WebKit Qt5WebKitWidgets Qt5WebSockets
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml Qt5XmlPatterns dbus-1
-WANTLIB += m ${MODPY_WANTLIB}
+WANTLIB += Qt5WebChannel Qt5WebSockets Qt5Widgets Qt5X11Extras
+WANTLIB += Qt5Xml Qt5XmlPatterns dbus-1 m ${MODPY_WANTLIB}
 
 FLAVORS=   python3
 FLAVOR=python3
@@ -50,7 +49,6 @@ LIB_DEPENDS=  ${MODPY_LIB_DEPENDS} \
x11/qt5/qtsvg \
x11/qt5/qttools \
x11/qt5/qtwebchannel \
-   x11/qt5/qtwebkit \
x11/qt5/qtwebsockets \
x11/qt5/qtx11extras \
x11/qt5/qtxmlpatterns
diff --git a/x11/py-qt5/patches/patch-configure_py 
b/x11/py-qt5/patches/patch-configure_py
index ea53c858d05..d4c37a62814 100644
--- a/x11/py-qt5/patches/patch-configure_py
+++ b/x11/py-qt5/patches/patch-configure_py
@@ -1,7 +1,27 @@
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -2157,7 +2157,18 @@ def run_command(cmd, verbose):
+@@ -96,10 +96,6 @@ MODULE_METADATA = {
+ 'QtWebChannel': ModuleMetadata(
+ qmake_QT=['webchannel', 'network',
+ '-gui']),
+-'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']),
+-'QtWebKitWidgets':  ModuleMetadata(
+-qmake_QT=['webkitwidgets',
+-'printsupport']),
+ 'QtWebSockets': ModuleMetadata(qmake_QT=['websockets', '-gui']),
+ 'QtWidgets':ModuleMetadata(qmake_QT=['widgets'], 
qpy_lib=True),
+ 'QtWinExtras':  ModuleMetadata(qmake_QT=['winextras', 'widgets']),
+@@ -1306,8 +1302,6 @@ def check_modules(target_config, disabled_modules, ver
+ 'qsvgwidget.h', 'new QSvgWidget()')
+ check_module(target_config, disabled_modules, verbose, 'QtTest', 'QtTest',
+ 'QTest::qSleep(0)')
+-check_module(target_config, disabled_modules, verbose, 'QtWebKit',
+-'qwebkitglobal.h', 'qWebKitVersion()')
+ check_module(target_config, disabled_modules, verbose, 'QtWebKitWidgets',
+ 'qwebpage.h', 'new QWebPage()')
+ check_module(target_config, disabled_modules, verbose, 'QtWidgets',
+@@ -2157,7 +2151,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 +40,7 @@ Index: configure.py
  if verbose:
  sys.stdout.write(cmd + "\n")
  
-@@ -2902,7 +2913,7 @@ Type 'no' to decline the terms of the license.
+@@ -2902,7 +2907,7 @@ Type 'no' to decline the terms of the license.
  sys.stdout.flush()
  
  try:
diff --git a/x11/py-qt5/pkg/PLIST b/x11/py-qt5/pkg/PLIST
index ae8c0694878..0675e87f2de 100644
--- a/x11/py-qt5/pkg/PLIST
+++ b/x11/py-qt5/pkg/PLIST
@@ -34,8 +34,6 @@ 
lib/python${MODPY_VERSION}/site-packages/PyQt5-${MODPY_EGG_VERSION}.dist-info/RE
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest${MODPY_ABI3SO}.so
 @so 
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTextToSpeech${MODPY_ABI3SO}.so
 @so 
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel${MODPY_ABI3SO}.so
-@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit${MODPY_ABI3SO}.so
-@so 
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets${MODPY_ABI3SO}.so
 @so 
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets${MODPY_ABI3SO}.so
 @so 
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras${MODPY_ABI3SO}.so
@@ -728,25 +726,6 @@ 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/QtWebChanne
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/QtWebChannelmod.sip
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/qwebchannel.sip
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/qwebchannelabstracttransport.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/
-lib/python${MOD

Re: Update py-qt5 and friends

2022-08-17 Thread Stuart Henderson 
> math/octave hits the same as py-qscintilla btw.

fallout from this is:

cad/openscad
math/octave
editors/py-qscintilla,python3

Re: Update py-qt5 and friends

2022-08-16 Thread Stuart Henderson 
On 2022/08/16 22:28, Landry Breuil wrote:
> Le Tue, Aug 16, 2022 at 09:53:01PM +0200, Landry Breuil a écrit :
> > Le Tue, Aug 16, 2022 at 05:16:58PM +0100, Stuart Henderson a écrit :
> > > I hit this on a test build I'm doing on i386. It has updated py-setuptools
> > > but I don't think that will affect this (I can run a clean one to make 
> > > sure
> > > when the machines are free)
> > > 
> > > Errors are like this:
> > > 
> > > ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference 
> > > to Scintilla::RunStyles::~RunStyles() 
> > > [--no-allow-shlib-undefined]
> > > 
> > > Build log first, cxxfilt'd symbol names from libqscintilla2_qt5.so.1.0
> > > below, here's the matching one from the first error above
> > > 
> > >  U Scintilla::RunStyles::~RunStyles()
> > > 
> > > missing inter-library link? is this working on amd64?
> > 
> > i can reproduce the issue on an i386 vm, same symptoms. Works on amd64,
> > Qsci binary links fine.
> > 
> > interestingly nm -g on libscintilla2_qt5.so.1.0 yields no RunStyle
> > symbols, defined or not.
> 
> maybe the right fix or not, but smth is definitely fishy.
> 
> patching the bottom of scintilla/src/RunStyles.cpp this way:
> --- scintilla/src/RunStyles.cpp.origFri May 13 17:07:38 2022
> +++ scintilla/src/RunStyles.cpp Tue Aug 16 22:23:39 2022
> @@ -308,7 +308,7 @@
>  
>  template class Scintilla::RunStyles;
>  template class Scintilla::RunStyles;
> -#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
> +#if 1
>  template class Scintilla::RunStyles;
>  template class Scintilla::RunStyles;
>  #endif
> 
> not easy to patch in the port since scintilla src is outside WRKSRC.
> 
> that allows py-qsci build to go further (still building). whats
> interesting is this line is here since forever. build system changes ?
> py-sip jokes ?
> 
> Landry
> 

math/octave hits the same as py-qscintilla btw.

Re: Update py-qt5 and friends

2022-08-16 Thread Landry Breuil 
Le Tue, Aug 16, 2022 at 09:53:01PM +0200, Landry Breuil a écrit :
> Le Tue, Aug 16, 2022 at 05:16:58PM +0100, Stuart Henderson a écrit :
> > I hit this on a test build I'm doing on i386. It has updated py-setuptools
> > but I don't think that will affect this (I can run a clean one to make sure
> > when the machines are free)
> > 
> > Errors are like this:
> > 
> > ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
> > Scintilla::RunStyles::~RunStyles() [--no-allow-shlib-undefined]
> > 
> > Build log first, cxxfilt'd symbol names from libqscintilla2_qt5.so.1.0
> > below, here's the matching one from the first error above
> > 
> >  U Scintilla::RunStyles::~RunStyles()
> > 
> > missing inter-library link? is this working on amd64?
> 
> i can reproduce the issue on an i386 vm, same symptoms. Works on amd64,
> Qsci binary links fine.
> 
> interestingly nm -g on libscintilla2_qt5.so.1.0 yields no RunStyle
> symbols, defined or not.

maybe the right fix or not, but smth is definitely fishy.

patching the bottom of scintilla/src/RunStyles.cpp this way:
--- scintilla/src/RunStyles.cpp.origFri May 13 17:07:38 2022
+++ scintilla/src/RunStyles.cpp Tue Aug 16 22:23:39 2022
@@ -308,7 +308,7 @@
 
 template class Scintilla::RunStyles;
 template class Scintilla::RunStyles;
-#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
+#if 1
 template class Scintilla::RunStyles;
 template class Scintilla::RunStyles;
 #endif

not easy to patch in the port since scintilla src is outside WRKSRC.

that allows py-qsci build to go further (still building). whats
interesting is this line is here since forever. build system changes ?
py-sip jokes ?

Landry

Re: Update py-qt5 and friends

2022-08-16 Thread Landry Breuil 
Le Tue, Aug 16, 2022 at 05:16:58PM +0100, Stuart Henderson a écrit :
> I hit this on a test build I'm doing on i386. It has updated py-setuptools
> but I don't think that will affect this (I can run a clean one to make sure
> when the machines are free)
> 
> Errors are like this:
> 
> ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
> Scintilla::RunStyles::~RunStyles() [--no-allow-shlib-undefined]
> 
> Build log first, cxxfilt'd symbol names from libqscintilla2_qt5.so.1.0
> below, here's the matching one from the first error above
> 
>  U Scintilla::RunStyles::~RunStyles()
> 
> missing inter-library link? is this working on amd64?

i can reproduce the issue on an i386 vm, same symptoms. Works on amd64,
Qsci binary links fine.

interestingly nm -g on libscintilla2_qt5.so.1.0 yields no RunStyle
symbols, defined or not.

Re: Update py-qt5 and friends

2022-08-16 Thread Stuart Henderson 
I hit this on a test build I'm doing on i386. It has updated py-setuptools
but I don't think that will affect this (I can run a clean one to make sure
when the machines are free)

Errors are like this:

ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
Scintilla::RunStyles::~RunStyles() [--no-allow-shlib-undefined]

Build log first, cxxfilt'd symbol names from libqscintilla2_qt5.so.1.0
below, here's the matching one from the first error above

 U Scintilla::RunStyles::~RunStyles()

missing inter-library link? is this working on amd64?



: i386.p; cat editors/py-qscintilla,python3.log
>>> Building on i386-1 under editors/py-qscintilla,python3
 BDEPENDS = 
[lang/python/3.9;x11/py-qt5,python3;x11/dbus-python,python3;devel/py-qt-builder,python3;devel/py-sip,python3;x11/qt5/qtbase,-main;x11/qt5/qttools,-main;editors/qscintilla]
 DIST = [editors/py-qscintilla,python3:QScintilla_src-2.13.3.tar.gz]
 FULLPKGNAME = py3-qscintilla-2.13.3
 RDEPENDS = 
[x11/dbus-python,python3;x11/py-qt5,python3;lang/python/3.9;editors/qscintilla;x11/qt5/qtbase,-main;devel/py-sip,python3]
(Junk lock obtained for i386-1 at 1660664197.32)
>>> Running depends in editors/py-qscintilla,python3 at 1660664197.35
   last junk was in textproc/apertium-dicts/fr-es
/usr/sbin/pkg_add -aI -Drepair py3-dbus-1.2.18p0 py3-qt-builder-1.13.0 
py3-qt5-5.15.7 py3-sip-6.6.2v0 qscintilla-2.13.3
was: /usr/sbin/pkg_add -aI -Drepair py3-dbus-1.2.18p0 py3-qt-builder-1.13.0 
py3-qt5-5.15.7 py3-sip-6.6.2v0 python-3.9.13p2 qscintilla-2.13.3 
qtbase-5.15.5p10 qttools-5.15.5
/usr/sbin/pkg_add -aI -Drepair py3-dbus-1.2.18p0 py3-qt-builder-1.13.0 
py3-qt5-5.15.7 py3-sip-6.6.2v0 qscintilla-2.13.3
>>> Running show-prepare-results in editors/py-qscintilla,python3 at 
>>> 1660664201.89
===> editors/py-qscintilla,python3
===> py3-qscintilla-2.13.3 depends on: py3-qt-builder-* -> py3-qt-builder-1.13.0
===> py3-qscintilla-2.13.3 depends on: py3-sip-* -> py3-sip-6.6.2v0
===> py3-qscintilla-2.13.3 depends on: py3-dbus-* -> py3-dbus-1.2.18p0
===> py3-qscintilla-2.13.3 depends on: py3-qt5-* -> py3-qt5-5.15.7
===> py3-qscintilla-2.13.3 depends on: python->=3.9,<3.10 -> python-3.9.13p2
===> py3-qscintilla-2.13.3 depends on: qttools-* -> qttools-5.15.5
===> py3-qscintilla-2.13.3 depends on: qscintilla-=2.13.3 -> qscintilla-2.13.3
===> py3-qscintilla-2.13.3 depends on: qtbase-* -> qtbase-5.15.5p10
===>  Verifying specs:  c++ c++abi pthread GL m Qt5Core Qt5Gui Qt5PrintSupport 
Qt5Widgets qscintilla2_qt5
===>  found c++.9.0 c++abi.6.0 pthread.26.1 GL.17.1 m.10.1 Qt5Core.3.1 
Qt5Gui.3.0 Qt5PrintSupport.3.0 Qt5Widgets.4.0 qscintilla2_qt5.1.0
py3-dbus-1.2.18p0
py3-qt-builder-1.13.0
py3-qt5-5.15.7
py3-sip-6.6.2v0
python-3.9.13p2
qscintilla-2.13.3
qtbase-5.15.5p10
qttools-5.15.5
(Junk lock released for i386-1 at 1660664205.68)
distfiles size=3060031
>>> Running patch in editors/py-qscintilla,python3 at 1660664205.70
===> editors/py-qscintilla,python3
===>  Checking files for py3-qscintilla-2.13.3
`/mnt/distfiles/QScintilla_src-2.13.3.tar.gz' is up to date.
>> (SHA256) QScintilla_src-2.13.3.tar.gz: OK
===>  Extracting for py3-qscintilla-2.13.3
# Needed to run sip-6.5+ sip-build
ln -sf /usr/local/bin/qmake-qt5 /pobj/py-qscintilla-2.13.3-python3/bin/qmake
cp 
/pobj/py-qscintilla-2.13.3-python3/QScintilla_src-2.13.3/Python/pyproject-qt5.toml
 /pobj/py-qscintilla-2.13.3-python3/QScintilla_src-2.13.3/Python/pyproject.toml
===>  Patching for py3-qscintilla-2.13.3
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
>>> Running configure in editors/py-qscintilla,python3 at 1660664207.63
===> editors/py-qscintilla,python3
===>  Generating configure for py3-qscintilla-2.13.3
===>  Configuring for py3-qscintilla-2.13.3
Querying qmake about your Qt installation...
/pobj/py-qscintilla-2.13.3-python3/bin/qmake -query
Checking to see if the Qsci bindings can be built...
/pobj/py-qscintilla-2.13.3-python3/bin/qmake Qsci.pro
Info: creating stash file 
/pobj/py-qscintilla-2.13.3-python3/QScintilla_src-2.13.3/Python/build/cfgtest_Qsci/.qmake.stash
make
c++ -c -pipe -Wall -Wextra -pthread -fPIC -DQSCINTILLA_DLL -DQT_NO_DEBUG 
-DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB  -I. 
-I/usr/local/include/X11/qt5 -I/usr/local/include/X11/qt5/QtPrintSupport 
-I/usr/local/include/X11/qt5/QtWidgets -I/usr/local/include/X11/qt5/QtGui 
-I/usr/local/include/X11/qt5/QtCore -I. -I/usr/X11R6/include 
-I/usr/X11R6/include/libdrm -I/usr/local/include 
-I/usr/local/lib/qt5/mkspecs/openbsd-clang -o cfgtest_Qsci.o 
../../config-tests/cfgtest_Qsci.cpp
clang++ -pthread -Wl,-rpath,/usr/X11R6/lib -Wl,-rpath,/usr/local/lib/qt5 
-Wl,-rpath,/usr/local/lib/qt5 -

Re: Update py-qt5 and friends

2022-07-26 Thread Landry Breuil 
Le Thu, Jul 07, 2022 at 08:44:31AM +0200, Rafael Sadowski a écrit :
> Here is an update diff to update:
> 
> - x11/py-qt5
> - x11/py-qtawesome
> - x11/py-qtpy
> - x11/py-sip-qt5
> - editors/qscintilla
> - editors/py-qscintilla
> - devel/py-qt-builder
> - devel/py-sip
> - www/py-qtwebengine
> 
> veusz need to be fixed before we can discuss to update this but I think
> it makes sense to share is work. I tested geo/qgis and www/qutebrowser
> with the qt5.15.5 update and the diff below at runtime.

can confirm that qgis works fine as before, after having rebuilt it with
all the other ports built from your diff:

qgis-3.26.1:py3-ply-3.11p4: ok
qgis-3.26.1:py3-sip-6.4.0p0v0->6.6.2v0: ok
qgis-3.26.1:py3-pyqt5_sip-12.9.0p1->12.11.0: ok
qgis-3.26.1:py3-qt5-5.15.6p0->5.15.7: ok
qscintilla-2.11.6->2.13.3 forward dependencies:
| Dependency of py3-qscintilla-2.11.6p1 on qscintilla-=2.11.6 doesn't match
Merging py3-qscintilla-2.11.6p1->2.13.3 (ok)
qgis-3.26.1:py3-qscintilla-2.11.6p1+qscintilla-2.11.6->py3-qscintilla+qscintilla-2.13.3:ok

also regarding
devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py i
hope it'll get pushed/reported upstream.

ok for me, as far as qgis is concerned, and thanks for the hard work :)

Landry

Re: Update py-qt5 and friends

2022-07-26 Thread Brian Callahan 
On 7/26/2022 10:08 AM, Landry Breuil wrote:
> Le Tue, Jul 26, 2022 at 01:57:00PM +, Brian Callahan a écrit :
>> On 7/26/2022 9:43 AM, Landry Breuil wrote:
>>> Le Sun, Jul 24, 2022 at 12:20:03PM +0200, Caspar Schutijser a écrit :
>>>> I build-tested this and also did some runtime testing of Calibre and
>>>> that seems to work fine. So in that sense it's OK. But the veusz
>>>> problem is still there, right? I looked around in some other ports
>>>> collections but I've not been able to find a patch we can borrow. So
>>>> I guess someone actually has to look at the problem. Don't have time
>>>> for that myself right now.
>>>
>>> there's an example on
>>> https://github.com/veusz/veusz/issues/595#issuecomment-1193392261 but it
>>> looks... only for sip wizards.
>>>
>>> bcallah, what's your opinion as math/veusz maintainer ?
>>>
>>> Landry
>>>
>>
>> I won't be able to look at this until the weekend. I will have to become
>> a sip wizard I suppose.
>>
>> If the py-qt5 update needs to go in and veusz is the only blocker, I
>> suppose we can mark veusz BROKEN until then. I know it's not ideal, but
>> I don't see a better option in that case.
> 
> I wouldnt say it 'needs to go in' but usually they're a large pain as
> several ports (sip,qscintilla,pyqt...) have to be updated altogether and
> all the consumers need to bec checked, rafael did the hard work and
> usually if those diffs accumulate they tend to get stale/conflicts and
> the person doing the work loses motivation :)
> 
> Landry

That sounds close enough to "needs to go in" for me :)
Let's get py-qt5 in, mark veusz as BROKEN and I'll do my best to make
the length of time veusz is broken as short as possible.

~Brian

Re: Update py-qt5 and friends

2022-07-26 Thread Landry Breuil 
Le Tue, Jul 26, 2022 at 01:57:00PM +, Brian Callahan a écrit :
> On 7/26/2022 9:43 AM, Landry Breuil wrote:
> > Le Sun, Jul 24, 2022 at 12:20:03PM +0200, Caspar Schutijser a écrit :
> >> I build-tested this and also did some runtime testing of Calibre and
> >> that seems to work fine. So in that sense it's OK. But the veusz
> >> problem is still there, right? I looked around in some other ports
> >> collections but I've not been able to find a patch we can borrow. So
> >> I guess someone actually has to look at the problem. Don't have time
> >> for that myself right now.
> > 
> > there's an example on
> > https://github.com/veusz/veusz/issues/595#issuecomment-1193392261 but it
> > looks... only for sip wizards.
> > 
> > bcallah, what's your opinion as math/veusz maintainer ?
> > 
> > Landry
> > 
> 
> I won't be able to look at this until the weekend. I will have to become
> a sip wizard I suppose.
> 
> If the py-qt5 update needs to go in and veusz is the only blocker, I
> suppose we can mark veusz BROKEN until then. I know it's not ideal, but
> I don't see a better option in that case.

I wouldnt say it 'needs to go in' but usually they're a large pain as
several ports (sip,qscintilla,pyqt...) have to be updated altogether and
all the consumers need to bec checked, rafael did the hard work and
usually if those diffs accumulate they tend to get stale/conflicts and
the person doing the work loses motivation :)

Landry

Re: Update py-qt5 and friends

2022-07-26 Thread Brian Callahan 
On 7/26/2022 9:43 AM, Landry Breuil wrote:
> Le Sun, Jul 24, 2022 at 12:20:03PM +0200, Caspar Schutijser a écrit :
>> I build-tested this and also did some runtime testing of Calibre and
>> that seems to work fine. So in that sense it's OK. But the veusz
>> problem is still there, right? I looked around in some other ports
>> collections but I've not been able to find a patch we can borrow. So
>> I guess someone actually has to look at the problem. Don't have time
>> for that myself right now.
> 
> there's an example on
> https://github.com/veusz/veusz/issues/595#issuecomment-1193392261 but it
> looks... only for sip wizards.
> 
> bcallah, what's your opinion as math/veusz maintainer ?
> 
> Landry
> 

I won't be able to look at this until the weekend. I will have to become
a sip wizard I suppose.

If the py-qt5 update needs to go in and veusz is the only blocker, I
suppose we can mark veusz BROKEN until then. I know it's not ideal, but
I don't see a better option in that case.

~Brian

Re: Update py-qt5 and friends

2022-07-26 Thread Landry Breuil 
Le Sun, Jul 24, 2022 at 12:20:03PM +0200, Caspar Schutijser a écrit :
> I build-tested this and also did some runtime testing of Calibre and
> that seems to work fine. So in that sense it's OK. But the veusz
> problem is still there, right? I looked around in some other ports
> collections but I've not been able to find a patch we can borrow. So
> I guess someone actually has to look at the problem. Don't have time
> for that myself right now.

there's an example on
https://github.com/veusz/veusz/issues/595#issuecomment-1193392261 but it
looks... only for sip wizards.

bcallah, what's your opinion as math/veusz maintainer ?

Landry

Re: Update py-qt5 and friends

2022-07-24 Thread Caspar Schutijser 
I build-tested this and also did some runtime testing of Calibre and
that seems to work fine. So in that sense it's OK. But the veusz
problem is still there, right? I looked around in some other ports
collections but I've not been able to find a patch we can borrow. So
I guess someone actually has to look at the problem. Don't have time
for that myself right now.

Caspar

On Sun, Jul 24, 2022 at 10:07:50AM +0200, Rafael Sadowski wrote:
> Annoying summer ping...
> 
> On Thu Jul 07, 2022 at 08:44:31AM +0200, Rafael Sadowski wrote:
> > Here is an update diff to update:
> > 
> > - x11/py-qt5
> > - x11/py-qtawesome
> > - x11/py-qtpy
> > - x11/py-sip-qt5
> > - editors/qscintilla
> > - editors/py-qscintilla
> > - devel/py-qt-builder
> > - devel/py-sip
> > - www/py-qtwebengine
> > 
> > veusz need to be fixed before we can discuss to update this but I think
> > it makes sense to share is work. I tested geo/qgis and www/qutebrowser
> > with the qt5.15.5 update and the diff below at runtime.
> > 
> > Here some notable changes/informations:
> > 
> > - sip-build no longer support following options:
> >   --qmake ${MODQT5_QMAKE} --jobs ${MAKE_JOBS} --no-make
> >   We have to set qmake in PATH. I solve this by:
> > 
> > +post-extract:
> > +   # Need to run sip-6.5+ sip-build
> > +   ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
> > 
> > - qgis builds fine with:
> >   devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
> >   See: https://github.com/qgis/QGIS/issues/49214
> > 
> > - XXX math/veusz broken
> > ImportError: cannot import name 'parse' from 'sipbuild.code_generator' 
> > (/usr/local/lib/python3.9/site-packages/sipbuild/code_generator.abi3.so)
> > https://github.com/veusz/veusz/issues/595
> > 
> > Rafael
> > 
> > Index: x11/py-qt5/Makefile
> > =======
> > RCS file: /cvs/ports/x11/py-qt5/Makefile,v
> > retrieving revision 1.31
> > diff -u -p -r1.31 Makefile
> > --- x11/py-qt5/Makefile 11 Mar 2022 20:16:57 -  1.31
> > +++ x11/py-qt5/Makefile 7 Jul 2022 06:11:48 -
> > @@ -2,10 +2,9 @@ COMMENT=   Python bindings for Qt5
> >  
> >  DPB_PROPERTIES=parallel
> >  
> > -MODPY_EGG_VERSION= 5.15.6
> > +MODPY_EGG_VERSION= 5.15.7
> >  DISTNAME=  PyQt5-${MODPY_EGG_VERSION}
> >  PKGNAME=   py-qt5-${MODPY_EGG_VERSION}
> > -REVISION=  0
> >  
> >  CATEGORIES=x11 devel
> >  
> > @@ -29,10 +28,12 @@ FLAVORS=python3
> >  FLAVOR=python3
> >  
> >  BUILD_DEPENDS= devel/py-qt-builder${MODPY_FLAVOR} \
> > +   devel/py-ply${MODPY_FLAVOR} \
> > x11/dbus-python${MODPY_FLAVOR}
> >  
> >  RUN_DEPENDS=   devel/py-sip${MODPY_FLAVOR}>=5.5.0v0 \
> > x11/py-sip-qt5${MODPY_FLAVOR}>=12.8 \
> > +   devel/py-ply${MODPY_FLAVOR} \
> > x11/dbus-python${MODPY_FLAVOR}
> >  
> >  LIB_DEPENDS=   ${MODPY_LIB_DEPENDS} \
> > @@ -62,11 +63,7 @@ MODPY_PI=Yes
> >  # 
> > https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-pyqt5
> >  CONFIGURE_STYLE= simple
> >  CONFIGURE_SCRIPT= ${LOCALBASE}/bin/sip-build
> > -CONFIGURE_ARGS=--verbose \
> > -   --qmake ${MODQT5_QMAKE} \
> > -   --jobs ${MAKE_JOBS} \
> > -   --no-make \
> > -   --confirm-license
> > +CONFIGURE_ARGS =   --verbose --confirm-license
> >  
> >  MAKE_FLAGS=-C build \
> > CC=${CC} \
> > @@ -75,6 +72,10 @@ MAKE_FLAGS=  -C build \
> > CXXOPTS="${CXXFLAGS}"
> >  
> >  FAKE_FLAGS=INSTALL_ROOT=${DESTDIR}
> > +
> > +post-extract:
> > +   # Need to run sip-6.5+ sip-build
> > +   ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
> >  
> >  post-install:
> > ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> > Index: x11/py-qt5/distinfo
> > ===
> > RCS file: /cvs/ports/x11/py-qt5/distinfo,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 distinfo
> > --- x11/py-qt5/distinfo 31 Oct 2021 17:08:38 -0000      1.8
> > +++ x11/py-qt5/distinfo 7 Jul 2022 06:11:48 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (PyQt5-5.15.6.tar.gz) = gDQ7yrlf+6YZ8u0kZ/2Cj/6wolGtciW+X8BtzDM69FI=
> > -SIZE (PyQt5-5.15.6.tar.gz) = 3239505
> > +SHA256 (PyQt5-5.15.7.tar.gz) = dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ=
> &g

Re: Update py-qt5 and friends

2022-07-24 Thread Rafael Sadowski 
Annoying summer ping...

On Thu Jul 07, 2022 at 08:44:31AM +0200, Rafael Sadowski wrote:
> Here is an update diff to update:
> 
> - x11/py-qt5
> - x11/py-qtawesome
> - x11/py-qtpy
> - x11/py-sip-qt5
> - editors/qscintilla
> - editors/py-qscintilla
> - devel/py-qt-builder
> - devel/py-sip
> - www/py-qtwebengine
> 
> veusz need to be fixed before we can discuss to update this but I think
> it makes sense to share is work. I tested geo/qgis and www/qutebrowser
> with the qt5.15.5 update and the diff below at runtime.
> 
> Here some notable changes/informations:
> 
> - sip-build no longer support following options:
>   --qmake ${MODQT5_QMAKE} --jobs ${MAKE_JOBS} --no-make
>   We have to set qmake in PATH. I solve this by:
> 
> +post-extract:
> + # Need to run sip-6.5+ sip-build
> + ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
> 
> - qgis builds fine with:
>   devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
>   See: https://github.com/qgis/QGIS/issues/49214
> 
> - XXX math/veusz broken
> ImportError: cannot import name 'parse' from 'sipbuild.code_generator' 
> (/usr/local/lib/python3.9/site-packages/sipbuild/code_generator.abi3.so)
> https://github.com/veusz/veusz/issues/595
> 
> Rafael
> 
> Index: x11/py-qt5/Makefile
> =======
> RCS file: /cvs/ports/x11/py-qt5/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- x11/py-qt5/Makefile   11 Mar 2022 20:16:57 -  1.31
> +++ x11/py-qt5/Makefile   7 Jul 2022 06:11:48 -
> @@ -2,10 +2,9 @@ COMMENT= Python bindings for Qt5
>  
>  DPB_PROPERTIES=  parallel
>  
> -MODPY_EGG_VERSION= 5.15.6
> +MODPY_EGG_VERSION= 5.15.7
>  DISTNAME=PyQt5-${MODPY_EGG_VERSION}
>  PKGNAME= py-qt5-${MODPY_EGG_VERSION}
> -REVISION=0
>  
>  CATEGORIES=  x11 devel
>  
> @@ -29,10 +28,12 @@ FLAVORS=  python3
>  FLAVOR=  python3
>  
>  BUILD_DEPENDS=   devel/py-qt-builder${MODPY_FLAVOR} \
> + devel/py-ply${MODPY_FLAVOR} \
>   x11/dbus-python${MODPY_FLAVOR}
>  
>  RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=5.5.0v0 \
>   x11/py-sip-qt5${MODPY_FLAVOR}>=12.8 \
> + devel/py-ply${MODPY_FLAVOR} \
>   x11/dbus-python${MODPY_FLAVOR}
>  
>  LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
> @@ -62,11 +63,7 @@ MODPY_PI=  Yes
>  # 
> https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-pyqt5
>  CONFIGURE_STYLE= simple
>  CONFIGURE_SCRIPT= ${LOCALBASE}/bin/sip-build
> -CONFIGURE_ARGS=  --verbose \
> - --qmake ${MODQT5_QMAKE} \
> - --jobs ${MAKE_JOBS} \
> - --no-make \
> - --confirm-license
> +CONFIGURE_ARGS = --verbose --confirm-license
>  
>  MAKE_FLAGS=  -C build \
>   CC=${CC} \
> @@ -75,6 +72,10 @@ MAKE_FLAGS=-C build \
>   CXXOPTS="${CXXFLAGS}"
>  
>  FAKE_FLAGS=  INSTALL_ROOT=${DESTDIR}
> +
> +post-extract:
> +     # Need to run sip-6.5+ sip-build
> + ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
>  
>  post-install:
>   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> Index: x11/py-qt5/distinfo
> ===
> RCS file: /cvs/ports/x11/py-qt5/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- x11/py-qt5/distinfo   31 Oct 2021 17:08:38 -  1.8
> +++ x11/py-qt5/distinfo   7 Jul 2022 06:11:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (PyQt5-5.15.6.tar.gz) = gDQ7yrlf+6YZ8u0kZ/2Cj/6wolGtciW+X8BtzDM69FI=
> -SIZE (PyQt5-5.15.6.tar.gz) = 3239505
> +SHA256 (PyQt5-5.15.7.tar.gz) = dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ=
> +SIZE (PyQt5-5.15.7.tar.gz) = 3238978
> Index: x11/py-qt5/pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- x11/py-qt5/pkg/PLIST  11 Mar 2022 20:16:57 -  1.11
> +++ x11/py-qt5/pkg/PLIST  7 Jul 2022 06:11:48 -
> @@ -78,6 +78,7 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/
>  lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCore.toml
>  lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/pyqt-gpl.sip5
>  
> lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstractanimation.sip
>  
> lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstracteventdispatcher.sip
>

Update py-qt5 and friends

2022-07-07 Thread Rafael Sadowski 
Here is an update diff to update:

- x11/py-qt5
- x11/py-qtawesome
- x11/py-qtpy
- x11/py-sip-qt5
- editors/qscintilla
- editors/py-qscintilla
- devel/py-qt-builder
- devel/py-sip
- www/py-qtwebengine

veusz need to be fixed before we can discuss to update this but I think
it makes sense to share is work. I tested geo/qgis and www/qutebrowser
with the qt5.15.5 update and the diff below at runtime.

Here some notable changes/informations:

- sip-build no longer support following options:
  --qmake ${MODQT5_QMAKE} --jobs ${MAKE_JOBS} --no-make
  We have to set qmake in PATH. I solve this by:

+post-extract:
+   # Need to run sip-6.5+ sip-build
+   ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake

- qgis builds fine with:
  devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
  See: https://github.com/qgis/QGIS/issues/49214

- XXX math/veusz broken
ImportError: cannot import name 'parse' from 'sipbuild.code_generator' 
(/usr/local/lib/python3.9/site-packages/sipbuild/code_generator.abi3.so)
https://github.com/veusz/veusz/issues/595

Rafael

Index: x11/py-qt5/Makefile
===
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- x11/py-qt5/Makefile 11 Mar 2022 20:16:57 -  1.31
+++ x11/py-qt5/Makefile 7 Jul 2022 06:11:48 -
@@ -2,10 +2,9 @@ COMMENT=   Python bindings for Qt5
 
 DPB_PROPERTIES=parallel
 
-MODPY_EGG_VERSION= 5.15.6
+MODPY_EGG_VERSION= 5.15.7
 DISTNAME=  PyQt5-${MODPY_EGG_VERSION}
 PKGNAME=   py-qt5-${MODPY_EGG_VERSION}
-REVISION=  0
 
 CATEGORIES=x11 devel
 
@@ -29,10 +28,12 @@ FLAVORS=python3
 FLAVOR=python3
 
 BUILD_DEPENDS= devel/py-qt-builder${MODPY_FLAVOR} \
+   devel/py-ply${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR}
 
 RUN_DEPENDS=   devel/py-sip${MODPY_FLAVOR}>=5.5.0v0 \
x11/py-sip-qt5${MODPY_FLAVOR}>=12.8 \
+   devel/py-ply${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR}
 
 LIB_DEPENDS=   ${MODPY_LIB_DEPENDS} \
@@ -62,11 +63,7 @@ MODPY_PI=Yes
 # 
https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-pyqt5
 CONFIGURE_STYLE= simple
 CONFIGURE_SCRIPT= ${LOCALBASE}/bin/sip-build
-CONFIGURE_ARGS=--verbose \
-   --qmake ${MODQT5_QMAKE} \
-   --jobs ${MAKE_JOBS} \
-   --no-make \
-   --confirm-license
+CONFIGURE_ARGS =   --verbose --confirm-license
 
 MAKE_FLAGS=-C build \
CC=${CC} \
@@ -75,6 +72,10 @@ MAKE_FLAGS=  -C build \
CXXOPTS="${CXXFLAGS}"
 
 FAKE_FLAGS=INSTALL_ROOT=${DESTDIR}
+
+post-extract:
+   # Need to run sip-6.5+ sip-build
+   ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
 
 post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: x11/py-qt5/distinfo
===
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- x11/py-qt5/distinfo 31 Oct 2021 17:08:38 -      1.8
+++ x11/py-qt5/distinfo 7 Jul 2022 06:11:48 -
@@ -1,2 +1,2 @@
-SHA256 (PyQt5-5.15.6.tar.gz) = gDQ7yrlf+6YZ8u0kZ/2Cj/6wolGtciW+X8BtzDM69FI=
-SIZE (PyQt5-5.15.6.tar.gz) = 3239505
+SHA256 (PyQt5-5.15.7.tar.gz) = dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ=
+SIZE (PyQt5-5.15.7.tar.gz) = 3238978
Index: x11/py-qt5/pkg/PLIST
===
RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- x11/py-qt5/pkg/PLIST11 Mar 2022 20:16:57 -      1.11
+++ x11/py-qt5/pkg/PLIST7 Jul 2022 06:11:48 -
@@ -78,6 +78,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCore.toml
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip
+lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/pyqt-gpl.sip5
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstractanimation.sip
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstracteventdispatcher.sip
 
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstractitemmodel.sip
Index: x11/py-qtawesome/Makefile
===
RCS file: /cvs/ports/x11/py-qtawesome/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- x11/py-qtawesome/Makefile   11 Mar 2022 20:16:57 -  1.10
+++ x11/py-qtawesome/Makefile   7 Jul 2022 06:11:48 -
@@ -1,10 +1,9 @@
 COMMENT =  FontAwesome icons in PyQt and PySide applications
 
-MODPY_EGG_VERSION =1.0.2
+MODPY_EGG_VERSION =1.1.1
 DISTNAME = QtAwesome-${MODPY_EGG_VERSION}
 PKGNAME =  py-qtawesome-${M

UPDATE: devel/py-sip, editors/py-qscintilla, editors/qscintilla, x11/py-qt5 and x11/py-sip-qt5

2021-01-06 Thread Rafael Sadowski 
Here is an update for devel/py-sip, editors/py-qscintilla,
editors/qscintilla, x11/py-qt5 and x11/py-sip-qt5 to the latest stable
vervions from riverbankcomputing.

**It is used exclusively for review.**

You can find the whole diff here:

Githup webui: https://github.com/openbsd/ports/pull/4/files
Full Diff: https://sizeofvoid.org/pub/OpenBSD/qt.5.15.2-full.diff
Full x11/qt5 diff: https://sizeofvoid.org/pub/OpenBSD/qt.5.15.2-only.diff

Actually, there is not much special here. except for "--sip-module
PyQt5.sip" in devel/py-sip. Documentaion see here:
https://www.riverbankcomputing.com/static/Docs/PyQt5/building_with_configure.html

**If you want test it I recommend to apply the full diff.**

diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 2dd528e1db7..ca84967112f 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -5,12 +5,11 @@ COMMENT=  automatically generate Python bindings for C 
and C++ libs
 # XXX  py-sip updates FREQUENTLY break other ports
 # XXX  BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
 
-MODPY_EGG_VERSION =4.19.19
+MODPY_EGG_VERSION =4.19.24
 EPOCH= 0
 DISTNAME=  sip-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=devel
-REVISION=  0
 
 HOMEPAGE=  https://www.riverbankcomputing.com/software/sip/intro
 
@@ -19,7 +18,7 @@ PERMIT_PACKAGE=   Yes
 
 WANTLIB=   m c ${COMPILER_LIBCXX}
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
 
 MASTER_SITES=  
https://www.riverbankcomputing.com/static/Downloads/sip/${MODPY_EGG_VERSION}/
 
@@ -34,6 +33,7 @@ CONFIGURE_ARGS=   -b ${PREFIX}/bin \
-d ${MODPY_SITEPKG} \
-e ${MODPY_INCDIR} \
-v ${PREFIX}/share/sip \
+   --sip-module PyQt5.sip \
INCDIR=${LOCALBASE}/include \
LIBDIR=${LOCALBASE}/lib \
CC=${CC} CXX=${CXX} \
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index f2034e2b3da..5eba9b446f0 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.19.tar.gz) = VDa2Gnj0jH6AeOk6a1lFOtM3gPgMZE5fOvOflL4e3kQ=
-SIZE (sip-4.19.19.tar.gz) = 1058422
+SHA256 (sip-4.19.24.tar.gz) = 7c03kLsBk4GR7vD2EX3gv1bRE2YmwN22ePOlWNYuQeU=
+SIZE (sip-4.19.24.tar.gz) = 1055461
diff --git a/devel/py-sip/patches/patch-configure_py 
b/devel/py-sip/patches/patch-configure_py
index dc0f31980b9..d15cb470919 100644
--- a/devel/py-sip/patches/patch-configure_py
+++ b/devel/py-sip/patches/patch-configure_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.4 2020/02/19 15:27:01 bket Exp 
$
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -270,7 +270,7 @@ def create_config(module, template, macros):
+@@ -271,7 +271,7 @@ def create_config(module, template, macros):
  "sip_version":  sip_version,
  "sip_version_str":  sip_version_str,
  "platform": build_platform,
diff --git a/devel/py-sip/pkg/PLIST b/devel/py-sip/pkg/PLIST
index 9aa1e5c44e1..e9d5553aa86 100644
--- a/devel/py-sip/pkg/PLIST
+++ b/devel/py-sip/pkg/PLIST
@@ -1,17 +1,18 @@
 @comment $OpenBSD: PLIST,v 1.11 2020/01/27 10:31:00 rsadowski Exp $
 @bin bin/sip${MODPY_BIN_SUFFIX}
 include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}/sip.h
+lib/python${MODPY_VERSION}/site-packages/PyQt5/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/sip.pyi
+@so lib/python${MODPY_VERSION}/site-packages/PyQt5/sip.so
+lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/RECORD
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipconfig.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipdistutils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/INSTALLER
-lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/sip.pyi
-@so lib/python${MODPY_VERSION}/site-packages/sip.so
 lib/python${MODPY_VERSION}/site-packages/sipconfig.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipconfig.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sipdistutils.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipdistutils.${MODPY_PYC_MAGIC_TAG}pyc
 share/doc/${MODPY_PY_PREFIX}sip/
 share/doc/${MODPY_PY_PREFIX}sip/annotations.rst.txt
 share/doc/${MODPY

Re: UPDATE x11/py-qt5-5.9.2

2020-02-12 Thread Rafael Sadowski 
On Wed Feb 12, 2020 at 12:17:03PM +0100, Björn Ketelaars wrote:
> Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
> Moving past the 5.9 branch is an endeavour by itself, and will take a
> bit of effort.
> 
> Tested on amd64 in combination with an update of py-sip (send in
> separate mail):
> - Build tested:
>   devel/git-cola
>   geo/qgis
>   math/veusz
>   textproc/calibre
>   www/weboob
> - Run tested:
>   devel/git-cola
>   devel/spyder/spyder
>   geo/qgis
>   math/veusz
>   shells/py-qtconsole
>   textproc/calibre
>   www/weboob (weboob-config-qt)
> 
> Comments/OK?

No objection, 5.13+ is for post 6.7.

> 
> 
> diff --git Makefile Makefile
> index 376011907ca..325785b9e82 100644
> --- Makefile
> +++ Makefile
> @@ -2,14 +2,13 @@
>  
>  COMMENT  =   python Qt5 bindings
>  
> -V=   5.9
> +V=   5.9.2
>  DISTNAME=PyQt5_gpl-${V}
>  PKGNAME= py-qt5-${V}
> -REVISION=6
>  
>  CATEGORIES=  x11 devel
>  
> -HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro
> +HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
>  MAINTAINER=  KDE porting team 
>  
>  # GPLv3 with exceptions for use with certain named open-source licenses
> diff --git distinfo distinfo
> index 335109979cb..e9a91d11b98 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
> -SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
> +SHA256 (PyQt5_gpl-5.9.2.tar.gz) = 
> wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
> +SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
> diff --git patches/patch-configure_py patches/patch-configure_py
> index 6f98c7b8802..b7896e1298b 100644
> --- patches/patch-configure_py
> +++ patches/patch-configure_py
> @@ -1,7 +1,8 @@
>  $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
>  configure.py.origMon Jul 25 15:55:28 2016
> -+++ configure.py Tue Aug  9 07:49:53 2016
> -@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
> +Index: configure.py
> +--- configure.py.orig
>  configure.py
> +@@ -1991,7 +1991,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 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 
> landry Exp $
>   if verbose:
>   sys.stdout.write(cmd + "\n")
>   
> -@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
> +@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
>   sys.stdout.flush()
>   
>   try:
> diff --git pkg/PLIST pkg/PLIST
> index da52f2ccbd4..d12521fc0f5 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -167,6 +167,10 @@ 
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
>  share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip
>

UPDATE x11/py-qt5-5.9.2

2020-02-12 Thread Björn Ketelaars 
Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
Moving past the 5.9 branch is an endeavour by itself, and will take a
bit of effort.

Tested on amd64 in combination with an update of py-sip (send in
separate mail):
- Build tested:
  devel/git-cola
  geo/qgis
  math/veusz
  textproc/calibre
  www/weboob
- Run tested:
  devel/git-cola
  devel/spyder/spyder
  geo/qgis
  math/veusz
  shells/py-qtconsole
  textproc/calibre
  www/weboob (weboob-config-qt)

Comments/OK?


diff --git Makefile Makefile
index 376011907ca..325785b9e82 100644
--- Makefile
+++ Makefile
@@ -2,14 +2,13 @@
 
 COMMENT=   python Qt5 bindings
 
-V= 5.9
+V= 5.9.2
 DISTNAME=  PyQt5_gpl-${V}
 PKGNAME=   py-qt5-${V}
-REVISION=  6
 
 CATEGORIES=x11 devel
 
-HOMEPAGE=  http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE=  https://www.riverbankcomputing.com/software/pyqt/intro
 MAINTAINER=KDE porting team 
 
 # GPLv3 with exceptions for use with certain named open-source licenses
diff --git distinfo distinfo
index 335109979cb..e9a91d11b98 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
-SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
+SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
+SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
diff --git patches/patch-configure_py patches/patch-configure_py
index 6f98c7b8802..b7896e1298b 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
 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):
+Index: configure.py
+--- configure.py.orig
 configure.py
+@@ -1991,7 +1991,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 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry 
Exp $
  if verbose:
  sys.stdout.write(cmd + "\n")
  
-@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
+@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
  sys.stdout.flush()
  
  try:
diff --git pkg/PLIST pkg/PLIST
index da52f2ccbd4..d12521fc0f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -167,6 +167,10 @@ 
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip

Re: switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Björn Ketelaars 
On Wed 05/02/2020 13:40, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 01:36:02PM +0100, Landry Breuil wrote:
> > On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> > > Diff below changes our port of git-cola a bit:
> > > - Switch from py-qt4 to py-qt5
> > > - Switch to python3
> > > - Drop dependency on textproc/xxdiff.
> > > 
> > > Rationale for the latter is that git-cola per default uses git.tool from
> > > .gitconfig. A user can easily pkg_add xxdiff, or one of its
> > > alternatives.
> > 
> > i've tried it and in the parameters, the "diff tool" and "merge tool"
> > still default to xxdiff, so if you have no .gitconfig xxdif should be
> > present :) Not sure removing the RDEP is ok unless you patch that and
> > use a contraption to run xterm -e diff... which might not be worth the
> > trouble.
> > 
> > Given that xxdiff can now use Qt5 and works fine, i'd keep the
> > dependency.
> > 
> > That said, ok for the xxdiff update & this git-cola move to py3, both
> > work fine here.
> 
> and git-cola reliably segfaults upon exit deep in py-sip so you might want
> to look into that and see if it's reproducible.. :)
> 
> [Current thread is 1 (process 531978)]
> (gdb) bt
> #0  0x17bfee4018d7 in sipOMFindObject () from 
> /usr/local/lib/python3.7/site-packages/sip.so
> #1  0x17bfcdff3226 in PyQtMonitor::on_destroyed(QObject*) () from 
> /usr/local/lib/python3.7/site-packages/PyQt5/QtCore.so
> #2  0x17bf8259f885 in QMetaObject::activate(QObject*, int, int, void**) 
> () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #3  0x17bf8259ecca in QMetaObject::activate(QObject*, QMetaObject const*, 
> int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #4  0x17bf82596a43 in QObject::destroyed(QObject*) () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #5  0x17bf825962a5 in QObject::~QObject() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #6  0x17bf82234a3d in QThreadPool::~QThreadPool() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #7  0x17bf822358e6 in ?? () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #8  0x17bfa2289f9d in _libc___cxa_finalize (dso=) at 
> /usr/src/lib/libc/stdlib/atexit.c:177
> #9  0x17bfa22692e1 in _libc_exit (status=0) at 
> /usr/src/lib/libc/stdlib/exit.c:54
> #10 0x17bf32f69932 in Py_Exit () from /usr/local/lib/libpython3.7m.so.0.0
> #11 0x17bf32f73741 in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #12 0x17bf32f73346 in PyErr_PrintEx () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #13 0x17bf32f72862 in PyRun_SimpleFileExFlags () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #14 0x17bf32f9701e in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #15 0x17bf32f97913 in _Py_UnixMain () from 
> /usr/local/lib/libpython3.7m.so.0.0

The version in ports as well as the proposed update segfault on exit.
Your analysis was spot on: issue is related to py-sip. Updating the
latter to a newer version (4.19.21) fixes the issue.

I will send an update for py-sip to ports@. In the mean time I propose
to move forward, and commit the changes to git-cola. OK?

Re: switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Landry Breuil 
On Wed, Feb 05, 2020 at 01:36:02PM +0100, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> > Diff below changes our port of git-cola a bit:
> > - Switch from py-qt4 to py-qt5
> > - Switch to python3
> > - Drop dependency on textproc/xxdiff.
> > 
> > Rationale for the latter is that git-cola per default uses git.tool from
> > .gitconfig. A user can easily pkg_add xxdiff, or one of its
> > alternatives.
> 
> i've tried it and in the parameters, the "diff tool" and "merge tool"
> still default to xxdiff, so if you have no .gitconfig xxdif should be
> present :) Not sure removing the RDEP is ok unless you patch that and
> use a contraption to run xterm -e diff... which might not be worth the
> trouble.
> 
> Given that xxdiff can now use Qt5 and works fine, i'd keep the
> dependency.
> 
> That said, ok for the xxdiff update & this git-cola move to py3, both
> work fine here.

and git-cola reliably segfaults upon exit deep in py-sip so you might want
to look into that and see if it's reproducible.. :)

[Current thread is 1 (process 531978)]
(gdb) bt
#0  0x17bfee4018d7 in sipOMFindObject () from 
/usr/local/lib/python3.7/site-packages/sip.so
#1  0x17bfcdff3226 in PyQtMonitor::on_destroyed(QObject*) () from 
/usr/local/lib/python3.7/site-packages/PyQt5/QtCore.so
#2  0x17bf8259f885 in QMetaObject::activate(QObject*, int, int, void**) () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#3  0x17bf8259ecca in QMetaObject::activate(QObject*, QMetaObject const*, 
int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2
#4  0x17bf82596a43 in QObject::destroyed(QObject*) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#5  0x17bf825962a5 in QObject::~QObject() () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#6  0x17bf82234a3d in QThreadPool::~QThreadPool() () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#7  0x17bf822358e6 in ?? () from /usr/local/lib/qt5/libQt5Core.so.2.2
#8  0x17bfa2289f9d in _libc___cxa_finalize (dso=) at 
/usr/src/lib/libc/stdlib/atexit.c:177
#9  0x17bfa22692e1 in _libc_exit (status=0) at 
/usr/src/lib/libc/stdlib/exit.c:54
#10 0x17bf32f69932 in Py_Exit () from /usr/local/lib/libpython3.7m.so.0.0
#11 0x17bf32f73741 in ?? () from /usr/local/lib/libpython3.7m.so.0.0
#12 0x17bf32f73346 in PyErr_PrintEx () from 
/usr/local/lib/libpython3.7m.so.0.0
#13 0x17bf32f72862 in PyRun_SimpleFileExFlags () from 
/usr/local/lib/libpython3.7m.so.0.0
#14 0x17bf32f9701e in ?? () from /usr/local/lib/libpython3.7m.so.0.0
#15 0x17bf32f97913 in _Py_UnixMain () from 
/usr/local/lib/libpython3.7m.so.0.0

Re: switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Landry Breuil 
On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> Diff below changes our port of git-cola a bit:
> - Switch from py-qt4 to py-qt5
> - Switch to python3
> - Drop dependency on textproc/xxdiff.
> 
> Rationale for the latter is that git-cola per default uses git.tool from
> .gitconfig. A user can easily pkg_add xxdiff, or one of its
> alternatives.

i've tried it and in the parameters, the "diff tool" and "merge tool"
still default to xxdiff, so if you have no .gitconfig xxdif should be
present :) Not sure removing the RDEP is ok unless you patch that and
use a contraption to run xterm -e diff... which might not be worth the
trouble.

Given that xxdiff can now use Qt5 and works fine, i'd keep the
dependency.

That said, ok for the xxdiff update & this git-cola move to py3, both
work fine here.

Re: switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Klemens Nanni 
On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> Diff below changes our port of git-cola a bit:
> - Switch from py-qt4 to py-qt5
> - Switch to python3
> - Drop dependency on textproc/xxdiff.
> 
> Rationale for the latter is that git-cola per default uses git.tool from
> .gitconfig. A user can easily pkg_add xxdiff, or one of its
> alternatives.
Sounds good, perhaps add a suggesting line to DESCR or README for new
users.

Given that Rafael wants to purge xxdiff, other graphical diff tools
might be better suited anyways.

> Testing:
> - 'make test' passes all tests
> - run tested on amd64
OK kn also without above mentioned, your choice.

switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Björn Ketelaars 
Diff below changes our port of git-cola a bit:
- Switch from py-qt4 to py-qt5
- Switch to python3
- Drop dependency on textproc/xxdiff.

Rationale for the latter is that git-cola per default uses git.tool from
.gitconfig. A user can easily pkg_add xxdiff, or one of its
alternatives.

Testing:
- 'make test' passes all tests
- run tested on amd64

Comments/OK?


diff --git Makefile Makefile
index ae56f932813..461839de26e 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,8 @@
 COMMENT =  python powered git gui
 
 MODPY_EGG_VERSION= 3.6
-DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
+DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =   git-cola
 GH_PROJECT =   git-cola
@@ -16,26 +17,25 @@ HOMEPAGE =  https://git-cola.github.io/
 MAINTAINER =   Bjorn Ketelaars 
 
 # GPLv2 only
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
 MODPY_PYTEST = Yes
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS =devel/gettext,-tools \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
 RUN_DEPENDS =  devel/desktop-file-utils \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
-TEST_DEPENDS = devel/py-mock
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
 
 USE_GMAKE =Yes
 
diff --git pkg/PLIST pkg/PLIST
index 22432fe9279..851d6eeae89 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -136,179 +136,182 @@ share/git-cola/icons/zoom-out.svg
 share/git-cola/lib/
 share/git-cola/lib/cola/
 share/git-cola/lib/cola/__init__.py
-share/git-cola/lib/cola/__init__.pyc
+${MODPY_COMMENT}share/git-cola/lib/cola/${MODPY_PYCACHE}/
+share/git-cola/lib/cola/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}diffparse.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}difftool.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}fsmonitor.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcfg.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gravatar.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}guicmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hidpi.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hotkeys.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}icons.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}inotify.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}interaction.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}observable.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtcompat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtutils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}spellcheck.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}textwrap.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 share/git-cola/lib/cola/_version.py
-share/git-cola/lib/cola/_version.pyc
 share/git-cola/lib/cola/actions.py
-share/git-cola/lib/cola/actions.pyc
 share/git-cola/lib/cola/app.py
-share/git-cola/lib/cola/app.pyc
 share/git-cola/lib/cola/cmd.py
-share/git-cola/lib/cola/cmd.pyc
 share/git-cola/lib/cola/cmds.py
-share/git-cola/lib/cola/cmds.pyc
 share/git-cola/lib/cola/compat.py

Re: [updates] py-qt5, py-sip, py-qscintilla & qscintilla

2016-08-10 Thread Landry Breuil 
On Tue, Aug 09, 2016 at 11:54:56AM +0200, Landry Breuil wrote:
> 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.

Fwiw, these updates allows me to get rid of the two hacks i had to put
in qgis 2.16 update to workaround sip crashes. So that's quite an
improvement for me :)

Landry

[updates] py-qt5, py-sip, py-qscintilla & qscintilla

2016-08-09 Thread Landry Breuil 
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
--- Makefile20 Mar 2016 16:12:23 -  1.30
+++ Makefile9 Aug 2016 09:47:25 -
@@ -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
--- distinfo26 Jun 2015 13:03:36 -  1.14
+++ distinfo9 Aug 2016 09:47:25 -
@@ -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 -  1.6
+++ pkg/PLIST   9 Aug 2016 09:47:25 -
@@ -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
--- Makefile26 Mar 2016 20:37:35 -  1.14
+++ Makefile9 Aug 2016 09:47:08 -
@@ -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
--- distinfo10 Nov 2013 22:23:43 -  1.5
+++ distinfo9 Aug 2016 09:47:08 -
@@ -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 -  1.2
+++ patches/patch-Qt4Qt5_qscintilla_pro 9 Aug 2016 09:47:08 -
@@ -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 -  1.4
+++ pkg/PLIST   9 Aug 2016 09:47:08 -
@@ -1,5 +1,4 @@
 @comment $OpenBSD

Re: py-qt5 - something wrong with pre-configure condition

2016-02-07 Thread Stuart Henderson 
On 2016/02/07 09:26, Jiri B wrote:
> IIUC we don't have MODPY_COMMENT-like trick for python3

See security/py-crypto or devel/py-gobject3 for examples of how
to do this.

Re: py-qt5 - something wrong with pre-configure condition

2016-02-07 Thread Stuart Henderson 
On 2016/02/07 07:16, Jiri B wrote:
> IMO there's something wrong with 'pre-configure' block in py-qt5, I've
> discovered it while working on python3 flavor (install part fails as
> it is working with python2 syntax [except IOError, e...]).

That was just copied from py-qt4, it probably won't work for py3 there
either, as you can see none of these ports support py3 as-is.

As things stand, it's just expected that py2 works.

Re: py-qt5 - something wrong with pre-configure condition

2016-02-07 Thread Jiri B 
On Sun, Feb 07, 2016 at 01:55:24PM +, Stuart Henderson wrote:
> On 2016/02/07 07:16, Jiri B wrote:
> > IMO there's something wrong with 'pre-configure' block in py-qt5, I've
> > discovered it while working on python3 flavor (install part fails as
> > it is working with python2 syntax [except IOError, e...]).
> 
> That was just copied from py-qt4, it probably won't work for py3 there
> either, as you can see none of these ports support py3 as-is.
> 
> As things stand, it's just expected that py2 works.

Thanks. I have solved it for myself for now like this:

$ sed -n '/^pre-configure/,$p' Makefile 
pre-configure:
.if ${FLAVOR:Mpython3}
rm -fr ${WRKSRC}/pyuic/uic/port_v2
.else
rm -fr ${WRKSRC}/pyuic/uic/port_v3
.endif


post-install:
mv ${WRKINST}${TRUEPREFIX}/bin/pylupdate5 
${WRKINST}${TRUEPREFIX}/bin/pylupdate5${MODPY_BIN_SUFFIX}
mv ${WRKINST}${TRUEPREFIX}/bin/pyrcc5 
${WRKINST}${TRUEPREFIX}/bin/pyrcc5${MODPY_BIN_SUFFIX}
mv ${WRKINST}${TRUEPREFIX}/bin/pyuic5 
${WRKINST}${TRUEPREFIX}/bin/pyuic5${MODPY_BIN_SUFFIX}
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}/${MODPY_SITEPKG}
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}qt5
cp -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/${MODPY_PY_PREFIX}qt5
chown -R ${SHAREOWN}:${SHAREGRP} 
${PREFIX}/share/doc/${MODPY_PY_PREFIX}qt5/*

.include 

But... There's 'share/sip' subdir :/ Fedora packages it only for
python2 and IIUC we don't have MODPY_COMMENT-like trick for python3
(thus to make python3 flavor to ignore it).

In PLIST I changed:

+@bin bin/pylupdate5${MODPY_BIN_SUFFIX}
+@bin bin/pyrcc5${MODPY_BIN_SUFFIX}
+bin/pyuic5${MODPY_BIN_SUFFIX}

plus commented out with MODPY_COMMENT '${MODPY_PYCACHE}/' lines.

I tried to open PanConvert (an QT5 GUI for pandoc converter) and it
opens the main windows.

j.

Re: py-qt5

2015-11-25 Thread Vadim Zhukov 
2015-11-24 4:17 GMT+03:00 Stuart Henderson :
> Based on the py-qt4 port, though I haven't figured out which if
> any modules should be zapped so I've not done the "only --enable
> a list of named modules" thing that py-qt4 does. Any comments?

The port looks good for me, and builds fine here on amd64. Okay zhuk@

--
  WBR,
  Vadim Zhukov

py-qt5

2015-11-23 Thread Stuart Henderson 
Based on the py-qt4 port, though I haven't figured out which if
any modules should be zapped so I've not done the "only --enable
a list of named modules" thing that py-qt4 does. Any comments?



py-qt5.tgz
Description: application/tar-gz