diff options
| author | adam <adam@pkgsrc.org> | 2018-02-01 21:09:29 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2018-02-01 21:09:29 +0000 |
| commit | ba55f04770b28b7d94890f352d713a56b4716870 (patch) | |
| tree | 03598ec7cfe328def29b4ed88ed2f623cf0e40e1 /x11/py-qt5/patches | |
| parent | ba3f4c0633d82c5ba386542714deec8df4d81df5 (diff) | |
| download | pkgsrc-ba55f04770b28b7d94890f352d713a56b4716870.tar.gz | |
py-qt5: updated to 5.10
v5.10:
- Added support for Qt v5.10.0.
- Added the QtNetworkAuth module.
Diffstat (limited to 'x11/py-qt5/patches')
| -rw-r--r-- | x11/py-qt5/patches/patch-configure.py | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py index cd6c73aa3d9..09a68e2432b 100644 --- a/x11/py-qt5/patches/patch-configure.py +++ b/x11/py-qt5/patches/patch-configure.py @@ -1,15 +1,36 @@ -$NetBSD: patch-configure.py,v 1.6 2018/01/22 04:17:11 dbj Exp $ +$NetBSD: patch-configure.py,v 1.7 2018/02/01 21:09:29 adam Exp $ Do not expect an app bundle on Darwin. ---- configure.py.orig 2017-11-02 10:53:20.000000000 +0000 +--- configure.py.orig 2018-01-23 10:20:28.000000000 +0000 +++ configure.py -@@ -1968,7 +1968,7 @@ def run_make(target_config, verbose, exe +@@ -2009,10 +2009,7 @@ def run_make(target_config, verbose, exe make = 'make' makefile_target = '' - if target_config.py_platform == 'darwin': -+ if target_config.py_platform == 'darwin' and False: - platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) - else: - platform_exe = os.path.join('.', exe) +- platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) +- else: +- platform_exe = os.path.join('.', exe) ++ platform_exe = os.path.join('.', exe) + + remove_file(platform_exe) + +@@ -2568,7 +2565,7 @@ def generate_module_makefile(target_conf + + # Note some version of Qt5 (probably incorrectly) implements + # 'plugin_bundle' instead of 'plugin' so we specify both. +- pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin plugin_bundle')) ++ pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin')) + + pro_add_qt_dependencies(target_config, metadata, pro_lines) + +@@ -2614,7 +2611,7 @@ win32 { + PY_MODULE = %s.so + + macx { +- PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET) ++ PY_MODULE_SRC = $(TARGET) + + QMAKE_LFLAGS += "-undefined dynamic_lookup" + |