diff options
| author | lesi <lesi@FreeBSD.org> | 2007-05-22 07:24:22 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2007-05-22 07:24:22 +0800 |
| commit | 0ebdb4e19f56acd342c5228772deb7f6600e0c4b (patch) | |
| tree | 101089326313b10f048b9e59dafeab7295f86ee2 /x11-toolkits | |
| parent | d5d0ba0841205239d939860dc75a0122d641df8d (diff) | |
| download | freebsd-ports-gnome-0ebdb4e19f56acd342c5228772deb7f6600e0c4b.tar.gz freebsd-ports-gnome-0ebdb4e19f56acd342c5228772deb7f6600e0c4b.tar.zst freebsd-ports-gnome-0ebdb4e19f56acd342c5228772deb7f6600e0c4b.zip | |
Now that both QT 3 and 4 install into same PREFIX, fix py-qt compilation
for those that have both installed.
Submitted by: maintainer
Approved by: portmgr (linimon)
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/py-qt/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-qt/files/patch-configure.py | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile index 3f941d465d10..91cfbfe0676d 100644 --- a/x11-toolkits/py-qt/Makefile +++ b/x11-toolkits/py-qt/Makefile @@ -6,7 +6,7 @@ PORTNAME= qt PORTVERSION= 3.17.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/ \ diff --git a/x11-toolkits/py-qt/files/patch-configure.py b/x11-toolkits/py-qt/files/patch-configure.py new file mode 100644 index 000000000000..f42fc0938f36 --- /dev/null +++ b/x11-toolkits/py-qt/files/patch-configure.py @@ -0,0 +1,21 @@ +--- configure.py.orig Sun May 13 20:08:01 2007 ++++ configure.py Sun May 13 20:14:01 2007 +@@ -1081,15 +1081,12 @@ + macros["LIBDIR_QT"] = qt_libdir + + # Check the Qt header files have been installed. Quietly check for Qt v4. +- qt4_d = os.path.join(qt_incdir, "QtCore") ++ # NO. This won't allow having both PyQt3 and PyQt4. Check for Qt3 only. + +- qglobal = os.path.join(qt4_d, "qglobal.h") ++ qglobal = os.path.join(qt_incdir, "qglobal.h") + + if not os.access(qglobal, os.F_OK): +- qglobal = os.path.join(qt_incdir, "qglobal.h") +- +- if not os.access(qglobal, os.F_OK): +- sipconfig.error("qglobal.h could not be found in %s." % qt_incdir) ++ sipconfig.error("qglobal.h could not be found in %s." % qt_incdir) + + # Get the Qt version number. + global qt_version |