diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2007-09-13 18:15:58 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2007-09-13 18:15:58 +0000 |
commit | 71fee7a28f398a2397323d85043fe27f64592ff3 (patch) | |
tree | 1bd1d6b6cd839caa689ea882fe31da6bd8c7ae79 /x11-toolkits/py-qt4-gui | |
parent | 3a031558959ee2330ba8253b9752de0ea489d195 (diff) | |
download | ports-71fee7a28f398a2397323d85043fe27f64592ff3.tar.gz ports-71fee7a28f398a2397323d85043fe27f64592ff3.zip |
- Update to PyQt-4.3
Submitted by: Danny Pansters <danny@ricin.com> (maintainer via privat mail)
Notes
Notes:
svn path=/head/; revision=199420
Diffstat (limited to 'x11-toolkits/py-qt4-gui')
-rw-r--r-- | x11-toolkits/py-qt4-gui/Makefile | 45 | ||||
-rw-r--r-- | x11-toolkits/py-qt4-gui/distinfo | 6 | ||||
-rw-r--r-- | x11-toolkits/py-qt4-gui/files/patch-configure.py | 188 | ||||
-rw-r--r-- | x11-toolkits/py-qt4-gui/pkg-plist | 9 |
4 files changed, 36 insertions, 212 deletions
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index 1d448c3c4a7d..3efc1b767540 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -5,8 +5,8 @@ # $FreeBSD$ PORTNAME= gui -PORTVERSION= 4.2 -PORTREVISION= 1 +PORTVERSION= 4.3 +PORTREVISION= # zero CATEGORIES= x11-toolkits devel python MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ http://freebsd.ricin.com/ports/distfiles/ @@ -16,11 +16,11 @@ DISTNAME= PyQt-x11-gpl-${PORTVERSION} MAINTAINER= danny@ricin.com COMMENT= Python bindings for the Qt4 toolkit, QtGui module -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes -USE_PYTHON= 2.3+ +USE_PYTHON= 2.5+ USE_QT_VER= 4 QT_COMPONENTS= gui imageformats iconengines qmake @@ -29,45 +29,52 @@ OPTIONS= API "Install QtGui API for QScintilla2" on \ SIPFILES "Install the QtGui SIP files" on \ TRACING "Enable tracing in generated code" off +PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -APIFILE= ${QT_PREFIX}/share/qt4/qsci/api/python/QtGui.api SIPDIR= ${PREFIX}/share/py-sip -ARGS= -b ${PREFIX}/bin -c -j 2 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 \ - -q ${QT_PREFIX}/bin/qmake-qt4 -a +CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" +ARGS= -b ${PREFIX}/bin\ + -d ${PYTHON_SITELIBDIR}\ + -q ${QT_PREFIX}/bin/qmake-qt4 .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) -ARGS+= -u +ARGS+= --debug .endif .if defined(WITHOUT_API) +ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.1:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtGui.api" .endif .if defined(WITHOUT_SIPFILES) -ARGS+= -v /dev/null +ARGS+= --no-sip-files PLIST_SUB+= SIPFILES="@comment " PLIST_SUB+= SIPDIR="@comment " .else -ARGS+= -v ${SIPDIR} +ARGS+= --sipdir ${SIPDIR} PLIST_SUB+= SIPFILES="" PLIST_SUB+= SIPDIR="share/py-sip" .endif .if defined(WITH_TRACING) -ARGS+= -r +ARGS+= --trace .endif +ARGS+= --enable QtGui do-configure: - ( cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${PYTHON_CMD} configure.py ${ARGS} ) + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ + ${PYTHON_CMD} configure.py ${ARGS} -post-install: -.if defined(WITHOUT_API) - ( ${RM} ${APIFILE} ) -.endif +post-configure: + ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ + -e 's|CC = cc|CC = ${CC}|'\ + -e 's|CXX = c++|CXX = ${CXX}|'\ + -e 's|LINK = c++|LINK = ${CXX}|'\ + ${WRKSRC}/QtGui/Makefile .include <bsd.port.post.mk> diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo index 3317bc659e04..504192030ea8 100644 --- a/x11-toolkits/py-qt4-gui/distinfo +++ b/x11-toolkits/py-qt4-gui/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef -SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6 -SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258 +MD5 (PyQt-x11-gpl-4.3.tar.gz) = 3bb0c0064dc6b8b80413f87a14e5553c +SHA256 (PyQt-x11-gpl-4.3.tar.gz) = c184c3df596c13e9ed610aa8fa0504881976c4d972ccab1b739738a95f4ab0e5 +SIZE (PyQt-x11-gpl-4.3.tar.gz) = 6036193 diff --git a/x11-toolkits/py-qt4-gui/files/patch-configure.py b/x11-toolkits/py-qt4-gui/files/patch-configure.py deleted file mode 100644 index 9990fe240fb2..000000000000 --- a/x11-toolkits/py-qt4-gui/files/patch-configure.py +++ /dev/null @@ -1,188 +0,0 @@ ---- configure.py.orig Tue Apr 10 17:59:52 2007 -+++ configure.py Thu Apr 12 22:14:40 2007 -@@ -138,26 +138,26 @@ - } - - def check_modules(self): -- pyqt_modules.append("QtCore") -+ #pyqt_modules.append("QtCore") - - check_module("QtGui", "qwidget.h", "new QWidget()") -- check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") -- check_module("QtOpenGL", "qgl.h", "new QGLWidget()") -- check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()") -- check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()") -- check_module("QtTest", "QtTest", "QTest::qSleep(0)") -- check_module("QtXml", "qdom.h", "new QDomDocument()") -- check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")") -+ #check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") -+ #check_module("QtOpenGL", "qgl.h", "new QGLWidget()") -+ #check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()") -+ #check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()") -+ #check_module("QtTest", "QtTest", "QTest::qSleep(0)") -+ #check_module("QtXml", "qdom.h", "new QDomDocument()") -+ #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")") -+ -+ #if sipcfg.universal: -+ # sipconfig.inform("QtDesigner module disabled with universal binaries") -+ #else: -+ # check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()") - -- if sipcfg.universal: -- sipconfig.inform("QtDesigner module disabled with universal binaries") -- else: -- check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()") -- -- check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer") -+ #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer") - -- if os.path.isdir("dbus"): -- check_dbus() -+ #if os.path.isdir("dbus"): -+ # check_dbus() - - def code(self): - # Note that the order of the dependent modules is important. -@@ -211,31 +211,31 @@ - generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"]) - - # Generate the consolidated module. -- sipconfig.inform("Creating Qt consolidated module...") -- f = open("Qt.py", "w") -+ #sipconfig.inform("Creating Qt consolidated module...") -+ #f = open("Qt.py", "w") - -- for m in pyqt_modules: -- f.write("from PyQt4.%s import *\n" % m) -+ #for m in pyqt_modules: -+ # f.write("from PyQt4.%s import *\n" % m) - -- f.close() -+ #f.close() - - # Generate the QScintilla API file. -- sipconfig.inform("Creating QScintilla API file...") -- f = open("PyQt4.api", "w") -+ #sipconfig.inform("Creating QScintilla API file...") -+ #f = open("PyQt4.api", "w") - -- for m in pyqt_modules: -- api = open(m + ".api") -+ #for m in pyqt_modules: -+ # api = open(m + ".api") - -- for l in api: -- f.write("PyQt4." + l) -+ # for l in api: -+ # f.write("PyQt4." + l) - -- api.close() -- os.remove(m + ".api") -+ # api.close() -+ # os.remove(m + ".api") - -- f.close() -+ #f.close() - - def module_installs(self): -- return ["__init__.py", "Qt.py", "pyqtconfig.py"] -+ return [] - - def qpylibs(self): - # See which QPy libraries to build. -@@ -308,7 +308,7 @@ - tool.append("dbus") - - # Only include ElementTree for older versions of Python. -- if sipcfg.py_version < 0x020500: -+ """if sipcfg.py_version < 0x020500: - sipconfig.inform("Creating elementtree Makefile...") - - makefile = sipconfig.PythonModuleMakefile( -@@ -339,7 +339,7 @@ - ) - - makefile.generate() -- tool.append("pyuic") -+ tool.append("pyuic")""" - - if "QtXml" in pyqt_modules: - sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -376,7 +376,8 @@ - makefile.generate() - tool.append("pyrcc") - else: -- sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.") -+ #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.") -+ pass - - if "QtDesigner" in pyqt_modules: - enabled = True -@@ -460,7 +461,7 @@ - sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir) - sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules)) - sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir) -- sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer")) -+ #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer")) - - if opt_api: - sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python")) -@@ -470,7 +471,7 @@ - - sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir) - -- sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opt_pyqtbindir) -+ #sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opt_pyqtbindir) - - if opt_vendorcheck: - sipconfig.inform("PyQt will only be usable with signed interpreters.") -@@ -808,7 +809,8 @@ - sipfiles = [] - - for s in glob.glob("sip/" + mname + "/*.sip"): -- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s))) -+ if mname == "QtGui": -+ sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s))) - - installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)]) - -@@ -873,7 +875,7 @@ - sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted) - - # Confirm the license. -- print -+ """print - print "Type 'L' to view the license." - print "Type 'yes' to accept the terms of the license." - print "Type 'no' to decline the terms of the license." -@@ -895,7 +897,7 @@ - - if resp == "l": - os.system("more LICENSE") -- -+ """ - # If there should be a license file then check it is where it should be. - if lfile: - if os.access(os.path.join("sip", lfile), os.F_OK): -@@ -1434,16 +1436,18 @@ - installs=[(pyqt.module_installs(), opt_pyqtmoddir)] - - if opt_api: -- installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python"))) -+ installs.append(("QtGui.api", os.path.join(opt_qscidir, "api", "python"))) -+ -+ pyqt_modules = ["QtGui"] - - sipconfig.ParentMakefile( - configuration=sipcfg, -- subdirs=pyqt.qpylibs() + pyqt_modules + pyqt.tools(), -+ subdirs=pyqt_modules, - installs=installs - ).generate() - - # Install the configuration module. -- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros) -+ #create_config("pyqtconfig.py", "pyqtconfig.py.in", macros) - - - ############################################################################### diff --git a/x11-toolkits/py-qt4-gui/pkg-plist b/x11-toolkits/py-qt4-gui/pkg-plist index 5a60097d3a20..7cac029c81d3 100644 --- a/x11-toolkits/py-qt4-gui/pkg-plist +++ b/x11-toolkits/py-qt4-gui/pkg-plist @@ -21,6 +21,7 @@ %%SIPFILES%%%%SIPDIR%%/QtGui/qclipboard.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qcolor.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qcolordialog.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qcolumnview.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qcombobox.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qcompleter.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qcursor.sip @@ -38,6 +39,7 @@ %%SIPFILES%%%%SIPDIR%%/QtGui/qerrormessage.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qevent.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qfiledialog.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qfileiconprovider.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qfocusframe.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qfont.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qfontcombobox.sip @@ -75,6 +77,8 @@ %%SIPFILES%%%%SIPDIR%%/QtGui/qlistwidget.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qmainwindow.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qmatrix.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qmdiarea.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qmdisubwindow.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qmenu.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qmenubar.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qmessagebox.sip @@ -144,6 +148,7 @@ %%SIPFILES%%%%SIPDIR%%/QtGui/qtoolbox.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qtoolbutton.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qtooltip.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qtransform.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qtreeview.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qtreewidget.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qtreewidgetitemiterator.sip @@ -155,12 +160,12 @@ %%SIPFILES%%%%SIPDIR%%/QtGui/qwidget.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qwidgetaction.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qwindowdefs.sip +%%SIPFILES%%%%SIPDIR%%/QtGui/qwizard.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qworkspace.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qx11embed_x11.sip %%SIPFILES%%%%SIPDIR%%/QtGui/qx11info_x11.sip -%%SIPFILES%%@dirrm %%SIPDIR%%/QtGui -@cwd %%LOCALBASE%% %%API%%%%APIFILE%% +%%SIPFILES%%@dirrm %%SIPDIR%%/QtGui %%API%%@dirrmtry share/qt4/qsci/api/python %%API%%@dirrmtry share/qt4/qsci/api %%API%%@dirrmtry share/qt4/qsci |