CVS commit: pkgsrc/x11/py-qt-builder

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug  5 06:16:27 UTC 2023

Modified Files:
        pkgsrc/x11/py-qt-builder: distinfo
        pkgsrc/x11/py-qt-builder/patches: patch-pyqtbuild_builder.py

Log Message:
py-qt-builder: refine Darwin support


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-qt-builder/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.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-qt-builder/distinfo
diff -u pkgsrc/x11/py-qt-builder/distinfo:1.9 pkgsrc/x11/py-qt-builder/distinfo:1.10
--- pkgsrc/x11/py-qt-builder/distinfo:1.9       Fri Aug  4 17:10:07 2023
+++ pkgsrc/x11/py-qt-builder/distinfo   Sat Aug  5 06:16:27 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2023/08/04 17:10:07 adam Exp $
+$NetBSD: distinfo,v 1.10 2023/08/05 06:16:27 adam Exp $
 
 BLAKE2s (PyQt-builder-1.15.2.tar.gz) = 1a0ac9f788f751955f3e3d7df0a237aab5a46d6e4588805252c6dedd996a939e
 SHA512 (PyQt-builder-1.15.2.tar.gz) = 3f8472ec51e9b456df80355d0351a66ea42902f81099993d57ae2c7f02c4ab142fa8089a87059f9e800a610d865e3e30bf890674b3a21f48eeb8375ec883f518
 Size (PyQt-builder-1.15.2.tar.gz) = 3908851 bytes
-SHA1 (patch-pyqtbuild_builder.py) = bcf4ce553412ca9df42c2c29867b4e7bfa6b250a
+SHA1 (patch-pyqtbuild_builder.py) = a5ef0e02949ac48d78f1c3cf20d7dd32edbf8028

Index: pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.py
diff -u pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.py:1.1 pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.py:1.2
--- pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.py:1.1     Fri Aug  4 17:10:08 2023
+++ pkgsrc/x11/py-qt-builder/patches/patch-pyqtbuild_builder.py Sat Aug  5 06:16:27 2023
@@ -1,9 +1,27 @@
-$NetBSD: patch-pyqtbuild_builder.py,v 1.1 2023/08/04 17:10:08 adam Exp $
+$NetBSD: patch-pyqtbuild_builder.py,v 1.2 2023/08/05 06:16:27 adam Exp $
 
 On Darwin, do not support application bundles.
 
---- pyqtbuild/builder.py.orig  2023-08-04 17:04:58.000000000 +0000
+--- pyqtbuild/builder.py.orig  2023-07-21 13:05:11.000000000 +0000
 +++ pyqtbuild/builder.py
+@@ -379,7 +379,7 @@ class QmakeBuilder(Builder):
+         else:
+             # Note some version of Qt5 (probably incorrectly) implements
+             # 'plugin_bundle' instead of 'plugin' so we specify both.
+-            pro_lines.append('CONFIG += plugin plugin_bundle no_default_rpath')
++            pro_lines.append('CONFIG += plugin no_default_rpath')
+ 
+         if project.qml_debug:
+             pro_lines.append('CONFIG += qml_debug')
+@@ -419,7 +419,7 @@ win32 {
+     PY_MODULE_SRC = $(DESTDIR_TARGET)
+ } else {
+     macx {
+-        PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
++        PY_MODULE_SRC = $(TARGET)
+         QMAKE_LFLAGS += "-undefined dynamic_lookup"
+     } else {
+         PY_MODULE_SRC = $(TARGET)
 @@ -609,11 +609,7 @@ macx {
          else:
              makefile_target = None