diff options
| author | adam <adam> | 2015-04-12 17:55:46 +0000 |
|---|---|---|
| committer | adam <adam> | 2015-04-12 17:55:46 +0000 |
| commit | b5a1d685cdd1ede911c038cf4e23553e7ef0845d (patch) | |
| tree | da08bd2e3609be0a06805c779f969ad1a451ff10 /x11 | |
| parent | fed4685a9c4b932148cb87509c10da0ddc9a088e (diff) | |
| download | pkgsrc-b5a1d685cdd1ede911c038cf4e23553e7ef0845d.tar.gz | |
Fix building on OS X
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/py-qt5/distinfo | 4 | ||||
| -rw-r--r-- | x11/py-qt5/patches/patch-configure.py | 27 |
2 files changed, 26 insertions, 5 deletions
diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo index 497dfbdd4c9..26c270714df 100644 --- a/x11/py-qt5/distinfo +++ b/x11/py-qt5/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/02/07 16:30:37 wiz Exp $ +$NetBSD: distinfo,v 1.2 2015/04/12 17:55:46 adam Exp $ SHA1 (PyQt-gpl-5.4.tar.gz) = 057e6b32c43e673e79f876fb9b6f33d3072edfc2 RMD160 (PyQt-gpl-5.4.tar.gz) = 93a7046162d6a65d781797599cf08532e1fb1746 Size (PyQt-gpl-5.4.tar.gz) = 3644542 bytes -SHA1 (patch-configure.py) = 482e3dbafdc4c901583d85655a4b734078c85a3b +SHA1 (patch-configure.py) = 7bf757bb94f40e7bbe3b572f4d05d9cf40d2e6c0 diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py index 8931a1c28a8..211a88146e5 100644 --- a/x11/py-qt5/patches/patch-configure.py +++ b/x11/py-qt5/patches/patch-configure.py @@ -1,10 +1,23 @@ -$NetBSD: patch-configure.py,v 1.1 2015/02/07 16:30:37 wiz Exp $ +$NetBSD: patch-configure.py,v 1.2 2015/04/12 17:55:46 adam Exp $ +On Darwin, do not expect application bundle. Adapt for pkgsrc change to make qmake create libtool files. ---- configure.py.orig 2014-03-14 14:38:18.000000000 +0000 +--- configure.py.orig 2014-12-25 10:18:15.000000000 +0000 +++ configure.py -@@ -2149,8 +2149,8 @@ win32 { +@@ -1858,10 +1858,7 @@ def run_make(target_config, verbose, exe + make = 'make' + makefile_target = '' + +- if target_config.py_platform == 'darwin': +- 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) + +@@ -2363,8 +2360,8 @@ win32 { target.files = %s%s.pyd LIBS += %s } else { @@ -15,3 +28,11 @@ Adapt for pkgsrc change to make qmake create libtool files. } ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name) +@@ -2434,7 +2431,6 @@ win32 { + } + macx { + QMAKE_LFLAGS += "-undefined dynamic_lookup" +- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)" + } + ''' + |