diff options
| author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-03-28 20:11:08 +0000 |
|---|---|---|
| committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-03-28 20:11:08 +0000 |
| commit | 57e388e44dba56bdfe9058ac3c315d9b15f9d2f0 (patch) | |
| tree | 12fc03df1b0e19aa030dff13d5679502916dc054 /x11-toolkits | |
| parent | - Update to 1.2.15 (diff) | |
- unbreak the build
- trim Makefile header, while here
PR: 177350
Submitted by: John Marino <draco@marino.st>
Obtained from: DragonFly BSD
Notes
Notes:
svn path=/head/; revision=315499
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/py-qt/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/py-qt/files/patch-configure.py | 41 |
2 files changed, 40 insertions, 9 deletions
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile index 56f92c02934c..8dd62cda090d 100644 --- a/x11-toolkits/py-qt/Makefile +++ b/x11-toolkits/py-qt/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: PyQt -# Date created: Sun Oct 17 00:24:28 PDT 1999 -# Whom: adsharma@sharmas.dhs.org -# +# Created by: adsharma@sharmas.dhs.org # $FreeBSD$ PORTNAME= qt PORTVERSION= 3.18.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/ \ @@ -22,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ qmake:${PORTSDIR}/devel/qmake -BROKEN= does not build with latest devel/py-sip DEPRECATED= Depends on QT3; unmaintained EXPIRATION_DATE= 2013-07-01 diff --git a/x11-toolkits/py-qt/files/patch-configure.py b/x11-toolkits/py-qt/files/patch-configure.py index f42fc0938f36..12d6256d5750 100644 --- a/x11-toolkits/py-qt/files/patch-configure.py +++ b/x11-toolkits/py-qt/files/patch-configure.py @@ -1,6 +1,41 @@ ---- configure.py.orig Sun May 13 20:08:01 2007 -+++ configure.py Sun May 13 20:14:01 2007 -@@ -1081,15 +1081,12 @@ +--- configure.py.orig 2013-03-27 00:54:08.000000000 +0000 ++++ configure.py +@@ -258,27 +258,27 @@ class ConfigurePyQt3(ConfigureBase): + } + + def code(self, extra_include_dirs, extra_lib_dir, extra_libs): +- generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs) ++ generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void") + + if "qtext" in pyqt_modules: +- generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags) ++ generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void") + + if "qtgl" in pyqt_modules: +- generate_code("qtgl", opengl=1) ++ generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void") + + if "qtpe" in pyqt_modules: +- generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags) ++ generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void") + + if "qtui" in pyqt_modules: +- generate_code("qtui", extra_libs=["qui"]) ++ generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void") + + if "qtaxcontainer" in pyqt_modules: +- generate_code("qtaxcontainer", extra_libs=["qaxcontainer"]) ++ generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void") + + # The rest don't need special handling. + for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"): + if m in pyqt_modules: +- generate_code(m) ++ generate_code(m, extra_cxxflags="-DANY=void") + + def tools(self): + tool_dirs = [] +@@ -1092,15 +1092,12 @@ def check_qt_installation(macros): macros["LIBDIR_QT"] = qt_libdir # Check the Qt header files have been installed. Quietly check for Qt v4. |