CVS commit: pkgsrc/x11/py-qt5

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug  4 22:30:09 UTC 2023

Modified Files:
        pkgsrc/x11/py-qt5: Makefile PLIST PLIST.Darwin
Added Files:
        pkgsrc/x11/py-qt5/patches: patch-configure.py

Log Message:
py-qt5: fix build for Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/py-qt5/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/py-qt5/PLIST.Darwin
cvs rdiff -u -r0 -r1.10 pkgsrc/x11/py-qt5/patches/patch-configure.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.84 pkgsrc/x11/py-qt5/Makefile:1.85
--- pkgsrc/x11/py-qt5/Makefile:1.84     Mon May 22 21:00:48 2023
+++ pkgsrc/x11/py-qt5/Makefile  Fri Aug  4 22:30:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2023/05/22 21:00:48 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2023/08/04 22:30:09 adam Exp $
 
 DISTNAME=      PyQt5-5.15.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
@@ -49,10 +49,10 @@ PLIST.x11=  yes
 .endif
 
 post-install:
+.for bin in pylupdate5 pyrcc5 pyuic5
        cd ${DESTDIR}${PREFIX}/bin && \
-       ${MV} pylupdate5 pylupdate5-${PYVERSSUFFIX} && \
-       ${MV} pyrcc5 pyrcc5-${PYVERSSUFFIX} && \
-       ${MV} pyuic5 pyuic5-${PYVERSSUFFIX} || ${TRUE}
+       ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
 
 .include "options.mk"
 

Index: pkgsrc/x11/py-qt5/PLIST
diff -u pkgsrc/x11/py-qt5/PLIST:1.22 pkgsrc/x11/py-qt5/PLIST:1.23
--- pkgsrc/x11/py-qt5/PLIST:1.22        Sun Dec 11 18:20:42 2022
+++ pkgsrc/x11/py-qt5/PLIST     Fri Aug  4 22:30:09 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/12/11 18:20:42 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.23 2023/08/04 22:30:09 adam Exp $
 bin/pylupdate5-${PYVERSSUFFIX}
 bin/pyrcc5-${PYVERSSUFFIX}
 bin/pyuic5-${PYVERSSUFFIX}
@@ -797,9 +797,9 @@ ${PYSITELIB}/PyQt5/bindings/QtWidgets/qw
 ${PYSITELIB}/PyQt5/bindings/QtWidgets/qwidget.sip
 ${PYSITELIB}/PyQt5/bindings/QtWidgets/qwidgetaction.sip
 ${PYSITELIB}/PyQt5/bindings/QtWidgets/qwizard.sip
-${PYSITELIB}/PyQt5/bindings/QtX11Extras/QtX11Extras.toml
-${PYSITELIB}/PyQt5/bindings/QtX11Extras/QtX11Extrasmod.sip
-${PYSITELIB}/PyQt5/bindings/QtX11Extras/qx11info_x11.sip
+${PLIST.x11}${PYSITELIB}/PyQt5/bindings/QtX11Extras/QtX11Extras.toml
+${PLIST.x11}${PYSITELIB}/PyQt5/bindings/QtX11Extras/QtX11Extrasmod.sip
+${PLIST.x11}${PYSITELIB}/PyQt5/bindings/QtX11Extras/qx11info_x11.sip
 ${PYSITELIB}/PyQt5/bindings/QtXml/QtXml.toml
 ${PYSITELIB}/PyQt5/bindings/QtXml/QtXmlmod.sip
 ${PYSITELIB}/PyQt5/bindings/QtXml/qdom.sip

Index: pkgsrc/x11/py-qt5/PLIST.Darwin
diff -u pkgsrc/x11/py-qt5/PLIST.Darwin:1.2 pkgsrc/x11/py-qt5/PLIST.Darwin:1.3
--- pkgsrc/x11/py-qt5/PLIST.Darwin:1.2  Fri Dec  2 15:31:37 2022
+++ pkgsrc/x11/py-qt5/PLIST.Darwin      Fri Aug  4 22:30:09 2023
@@ -1,2 +1,8 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2022/12/02 15:31:37 wiz Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2023/08/04 22:30:09 adam Exp $
 ${PYSITELIB}/PyQt5/QtMacExtras.abi3.so
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/QtMacExtras.toml
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/QtMacExtrasmod.sip
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/qmacpasteboardmime.sip
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/qmactoolbar.sip
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/qmactoolbaritem.sip
+${PYSITELIB}/PyQt5/bindings/QtMacExtras/qtmac.sip

Added files:

Index: pkgsrc/x11/py-qt5/patches/patch-configure.py
diff -u /dev/null pkgsrc/x11/py-qt5/patches/patch-configure.py:1.10
--- /dev/null   Fri Aug  4 22:30:09 2023
+++ pkgsrc/x11/py-qt5/patches/patch-configure.py        Fri Aug  4 22:30:09 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-configure.py,v 1.10 2023/08/04 22:30:09 adam Exp $
+
+Do not expect an app bundle on Darwin.
+
+--- configure.py.orig  2022-06-18 17:04:05.000000000 +0000
++++ configure.py
+@@ -442,7 +442,7 @@ class HostPythonConfiguration:
+             self.lib_dir = sys.prefix + '/lib'
+ 
+         # The name of the interpreter used by the pyuic5 wrapper.
+-        if sys.platform == 'darwin':
++        if False:
+             # The installation of MacOS's python is a mess that changes from
+             # version to version and where sys.executable is useless.
+ 
+@@ -2136,7 +2136,7 @@ def run_make(target_config, verbose, exe
+         make = 'make'
+         makefile_target = ''
+ 
+-        if target_config.py_platform == 'darwin':
++        if False:
+             platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe)
+         else:
+             platform_exe = os.path.join('.', exe)
+@@ -2701,7 +2701,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)
+ 
+@@ -2747,7 +2747,7 @@ win32 {
+     PY_MODULE = %s.so
+ 
+     macx {
+-        PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
++        PY_MODULE_SRC = $(TARGET)
+ 
+         QMAKE_LFLAGS += "-undefined dynamic_lookup"
+