[PyQt] openSUSE patches of PyQt

Phil Thompson phil at riverbankcomputing.com
Fri Jan 20 16:46:12 GMT 2017


On 17 Jan 2017, at 1:17 pm, Hans-Peter Jansen <hpj at urpla.net> wrote:
> 
> Hi Phil,
> 
> speaking of openSUSE PyQt patches, here's the current collection, that you 
> might want to consider:
> 
> $ cat disable-rpaths.diff
> --- designer/designer.pro-in.orig
> +++ designer/designer.pro-in
> @@ -1,4 +1,5 @@
> CONFIG      += plugin @QTCONFIG@ warn_on
> +CONFIG      -= rpath_libdirs
> QT          += designer
> 
> # Work around QTBUG-39300.
> 
> rpath usual makes more proplems, that is solves, but I don't overview all 
> implications.

Do you only disable rpath for the designer plugin? What about the QML plugin and the PyQt modules themselves?

> $ cat fix_qreal_check.diff
> Description: check if qreal is double based on sizeof
> Author: Dmitry Shachnev <mitya57 at gmail.com>
> Forwarded: no
> Last-Update: 2014-01-29
> 
> --- a/configure.py
> +++ b/configure.py
> @@ -676,9 +676,8 @@
> #if QT_VERSION < 0x050200
> // This is the test used in qglobal.h in Qt prior to v5.2.  In v5.2 and later
> // qreal is always double.
> -#if defined(QT_NO_FPU) || defined(Q_PROCESSOR_ARM) || defined(Q_OS_WINCE)
> -    out << "PyQt_qreal_double\\n";
> -#endif
> +    if (sizeof (qreal) != sizeof (double))
> +        out << "PyQt_qreal_double\\n";
> #endif
> 
> #if defined(QT_NO_PROCESS)
> 
> 
> That looks like a good (better) approach to the problem.

The patch has been tried before, caused problems and was reverted. In any event this, as written, only affects Qt v5.0 and v5.1.

I have changed configure.py to, additionally, use the size comparison for Qt v5.2 and later.

> $ cat obsolete_window_flag.diff
> --- sip/QtCore/qnamespace.sip.orig      2016-07-25 15:55:37.000000000 +0200
> +++ sip/QtCore/qnamespace.sip   2016-11-29 18:19:44.678618844 +0100
> @@ -209,8 +209,6 @@ namespace Qt
>         WindowContextHelpButtonHint,
>         WindowShadeButtonHint,
>         WindowStaysOnTopHint,
> -        WindowOkButtonHint,
> -        WindowCancelButtonHint,
>         WindowStaysOnBottomHint,
>         WindowCloseButtonHint,
>         MacWindowToolBarButtonHint,
> 
> 
> These are Win CE artifacts, anybody running PyQt projects on Win CE, 
> yet/still?

This is a bad idea. You don't know if somebody is using the values (maybe for some other purpose). This changes the API and effectively forks PyQt.

> The last, I mentioned in the "PyQt5 5.7.1 Bug: debug build on Windows broken" 
> thread already.

I've added a --qml-debug option. --debug no longer enables QML debugging.

Phil



More information about the PyQt mailing list