diff options
| author | dbj <dbj@pkgsrc.org> | 2015-01-27 06:10:15 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2015-01-27 06:10:15 +0000 |
| commit | 1f8836e88ad89870564bb6bede66988308211831 (patch) | |
| tree | 65b44b9025fcb96769e6508bccb61fd471bcf0b2 /x11 | |
| parent | 552f6127bd5668d195965934b9db45a175c1277e (diff) | |
| download | pkgsrc-1f8836e88ad89870564bb6bede66988308211831.tar.gz | |
don't assume the native python on Darwin
ignore the mac qt distfile, which only differs in documentation
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/py-qt4/Makefile | 6 | ||||
| -rw-r--r-- | x11/py-qt4/distinfo | 4 | ||||
| -rw-r--r-- | x11/py-qt4/patches/patch-configure.py (renamed from x11/py-qt4/patches/patch-aa) | 22 |
3 files changed, 24 insertions, 8 deletions
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index 72cd1660fc1..94f76a91f5a 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2014/08/21 21:33:07 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2015/01/27 06:10:15 dbj Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.11.1 @@ -53,12 +53,8 @@ SUBST_MESSAGE.PIC= Adding -fPIC to CXXFLAGS. .include "../../mk/bsd.prefs.mk" PLIST_SRC= ${PKGDIR}/PLIST.common -.if ${OPSYS} == "Darwin" -DISTNAME= PyQt-mac-gpl-${PYQT_VERSION} -.else DISTNAME= PyQt-x11-gpl-${PYQT_VERSION} PLIST_SRC+= ${PKGDIR}/PLIST.X11 -.endif .include "../../lang/python/extension.mk" CONFIGURE_ARGS+= --verbose diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo index c1ef4fa6105..717a6836cf1 100644 --- a/x11/py-qt4/distinfo +++ b/x11/py-qt4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2014/09/25 11:03:52 jperkin Exp $ +$NetBSD: distinfo,v 1.35 2015/01/27 06:10:15 dbj Exp $ SHA1 (PyQt-mac-gpl-4.11.1.tar.gz) = 9d7478758957c60ac5007144a0dc7f157f4a5836 RMD160 (PyQt-mac-gpl-4.11.1.tar.gz) = cba54dcbb6a41d5ccb45d9b38e7e2647696772f9 @@ -6,5 +6,5 @@ Size (PyQt-mac-gpl-4.11.1.tar.gz) = 11117079 bytes SHA1 (PyQt-x11-gpl-4.11.1.tar.gz) = 83a0740545d51c179a1b316b664b0f9ff5e0f5af RMD160 (PyQt-x11-gpl-4.11.1.tar.gz) = 37f5dc06b4d06720a9f94dcd50f67a011c2dad78 Size (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 bytes -SHA1 (patch-aa) = 218eb50a2b027384030e5ba9900631138687fac3 +SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1 diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-configure.py index 52d1ef98733..7ba0c553d36 100644 --- a/x11/py-qt4/patches/patch-aa +++ b/x11/py-qt4/patches/patch-configure.py @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.11 2014/08/21 21:33:07 wiz Exp $ +$NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $ --- configure.py.orig 2014-07-03 14:00:02.000000000 +0000 +++ configure.py @@ -22,6 +22,26 @@ $NetBSD: patch-aa,v 1.11 2014/08/21 21:33:07 wiz Exp $ check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, extra_libs=ass_libs) +@@ -968,7 +968,7 @@ include(%s) + + config_args = ducfg.get("CONFIG_ARGS", "") + +- if sys.platform == "darwin": ++ if False: # sys.platform == "darwin": + dynamic_pylib = "--enable-framework" in config_args + + # It's probably a Python bug that the library name doesn't +@@ -1963,8 +1963,8 @@ def get_qt_configuration(): + else: + exe_file = os.path.join("release", app + ".exe") + make_target = " release" +- elif sys.platform == "darwin": +- exe_file = os.path.join(app + ".app", "Contents", "MacOS", app) ++# elif sys.platform == "darwin": ++# exe_file = os.path.join(app + ".app", "Contents", "MacOS", app) + else: + exe_file = os.path.join(".", app) + @@ -2027,11 +2027,7 @@ int main(int argc, char **argv) out << QLibraryInfo::licensee() << '\\n'; |