From 6175695b4bf38b2610f60af543aaaec3bca91855 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 12 Apr 2020 06:24:30 +0000 Subject: py-qt5: updated to 5.14.2 v5.14.2 - Added the missing QTextCodec.convertFromUnicode(). - Added the OpenGL ES bindings. - Added QFlags.__index__(). v5.14.1 - This is a bug fix release. v5.14.0 - Added support for Qt v5.14.0. --- x11/py-qt5/patches/patch-configure.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'x11/py-qt5/patches') diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py index 09a68e2432b..98b32dcec65 100644 --- a/x11/py-qt5/patches/patch-configure.py +++ b/x11/py-qt5/patches/patch-configure.py @@ -1,10 +1,10 @@ -$NetBSD: patch-configure.py,v 1.7 2018/02/01 21:09:29 adam Exp $ +$NetBSD: patch-configure.py,v 1.8 2020/04/12 06:24:31 adam Exp $ Do not expect an app bundle on Darwin. ---- configure.py.orig 2018-01-23 10:20:28.000000000 +0000 +--- configure.py.orig 2020-04-02 14:58:06.000000000 +0000 +++ configure.py -@@ -2009,10 +2009,7 @@ def run_make(target_config, verbose, exe +@@ -2137,10 +2137,7 @@ def run_make(target_config, verbose, exe make = 'make' makefile_target = '' @@ -16,7 +16,7 @@ Do not expect an app bundle on Darwin. remove_file(platform_exe) -@@ -2568,7 +2565,7 @@ def generate_module_makefile(target_conf +@@ -2702,7 +2699,7 @@ def generate_module_makefile(target_conf # Note some version of Qt5 (probably incorrectly) implements # 'plugin_bundle' instead of 'plugin' so we specify both. @@ -25,7 +25,7 @@ Do not expect an app bundle on Darwin. pro_add_qt_dependencies(target_config, metadata, pro_lines) -@@ -2614,7 +2611,7 @@ win32 { +@@ -2748,7 +2745,7 @@ win32 { PY_MODULE = %s.so macx { @@ -34,3 +34,12 @@ Do not expect an app bundle on Darwin. QMAKE_LFLAGS += "-undefined dynamic_lookup" +@@ -3008,7 +3005,7 @@ def check_sip(target_config, verbose): + + os.makedirs(target_config.sip_inc_dir, exist_ok=True) + +- argv = ['sip-module', '--sip-h'] ++ argv = ['sip-module-@PYVERSSUFFIX@', '--sip-h'] + + if target_config.abi_version: + argv.append('--abi-version') -- cgit v1.2.3