From 0021bbfc045a138040c94c2ede4c2ff40ea45305 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Tue, 17 May 2011 08:38:32 +0000 Subject: [PATCH] Update to PyQt-4.8.4. Tested in a bulk build by landry@ OK landry@, sthen@ --- x11/py-qt4/Makefile | 12 +-- x11/py-qt4/distinfo | 10 +-- x11/py-qt4/patches/patch-configure_py | 10 +-- x11/py-qt4/pkg/PLIST-docs | 103 +++++++++++++++++++++++++- x11/py-qt4/pkg/PLIST-main | 5 +- 5 files changed, 118 insertions(+), 22 deletions(-) diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index 9c94960dd78..5f72221130e 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2011/04/20 05:19:06 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.32 2011/05/17 08:38:32 dcoppa Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT-main= python Qt4 bindings COMMENT-docs= py-qt4 documentation # XXX: Upstream doesn't keep old files; if updating please mirror or ask sthen@ -V= 4.8.1 +V= 4.8.4 DISTNAME= PyQt-x11-gpl-${V} PKGNAME= py-qt4-${V} PKGNAME-main= py-qt4-${V} @@ -24,8 +24,8 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += GL GLU X11 Xext c dbus-1 m pthread stdc++ -WANTLIB += QtDesigner QtGui QtNetwork QtOpenGL -WANTLIB += QtScript QtSql QtSvg QtTest QtXml +WANTLIB += QtDesigner QtGui QtHelp QtNetwork QtOpenGL +WANTLIB += QtScript QtSql QtSvg QtTest QtWebKit QtXml WANTLIB += ${MODPY_WANTLIB} MULTI_PACKAGES= -main -docs @@ -36,9 +36,9 @@ RUN_DEPENDS-docs= PKG_ARCH-docs= * BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= devel/py-sip>=4.12 \ +RUN_DEPENDS= devel/py-sip>=4.12.2 \ x11/dbus-python -LIB_DEPENDS= ${MODQT4_LIB_DEPENDS}>=4.7.0 \ +LIB_DEPENDS= ${MODQT4_LIB_DEPENDS}>=4.7.2 \ ${MODPY_LIB_DEPENDS} NO_REGRESS= Yes diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo index c7cbfbb2dfa..04f0477a758 100644 --- a/x11/py-qt4/distinfo +++ b/x11/py-qt4/distinfo @@ -1,5 +1,5 @@ -MD5 (PyQt-x11-gpl-4.8.1.tar.gz) = HKyPXXFcQU+csnUbDoTMBw== -RMD160 (PyQt-x11-gpl-4.8.1.tar.gz) = 5boNmDWc4xVDL0eaX0Sywa5pt3o= -SHA1 (PyQt-x11-gpl-4.8.1.tar.gz) = 4GTtOIF7r95y8qV2edgNQMcBWvs= -SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = H+q4DcgtzUUSM+3rHN6cx1+ji26PR3gOxtwxfr4M83A= -SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 +MD5 (PyQt-x11-gpl-4.8.4.tar.gz) = l8XcEEL+tbP+ILqrrQVa8Q== +RMD160 (PyQt-x11-gpl-4.8.4.tar.gz) = EA0W6QBeO4PwAw5JihbZljbJA0w= +SHA1 (PyQt-x11-gpl-4.8.4.tar.gz) = dHI21d0QNofKxUdGrwokoa28Bnw= +SHA256 (PyQt-x11-gpl-4.8.4.tar.gz) = /Po+zAtPrW2TIndRs2pvgeoQTuGd0mkF9S3lnwYLPpg= +SIZE (PyQt-x11-gpl-4.8.4.tar.gz) = 9799081 diff --git a/x11/py-qt4/patches/patch-configure_py b/x11/py-qt4/patches/patch-configure_py index b5789edd0a6..48d0d97ee49 100644 --- a/x11/py-qt4/patches/patch-configure_py +++ b/x11/py-qt4/patches/patch-configure_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_py,v 1.9 2011/01/16 17:07:05 jasper Exp $ ---- configure.py.orig Fri Oct 29 16:43:52 2010 -+++ configure.py Sun Jan 16 16:57:10 2011 -@@ -1083,6 +1083,17 @@ def run_command(cmd): +$OpenBSD: patch-configure_py,v 1.10 2011/05/17 08:38:32 dcoppa Exp $ +--- configure.py.orig Sun May 1 14:50:12 2011 ++++ configure.py Fri May 13 17:13:34 2011 +@@ -1127,6 +1127,17 @@ def run_command(cmd, envvars=None): cmd is the command to run. """ @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_py,v 1.9 2011/01/16 17:07:05 jasper Exp $ if opts.verbose: sys.stdout.write(cmd + "\n") -@@ -1697,7 +1708,7 @@ Type 'no' to decline the terms of the license. +@@ -1791,7 +1802,7 @@ Type 'no' to decline the terms of the license. sys.stdout.flush() try: diff --git a/x11/py-qt4/pkg/PLIST-docs b/x11/py-qt4/pkg/PLIST-docs index af67a44000a..952f06259d6 100644 --- a/x11/py-qt4/pkg/PLIST-docs +++ b/x11/py-qt4/pkg/PLIST-docs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-docs,v 1.7 2010/11/10 22:12:40 jasper Exp $ +@comment $OpenBSD: PLIST-docs,v 1.8 2011/05/17 08:38:33 dcoppa Exp $ @comment lib/python${MODPY_VERSION}/ @comment lib/python${MODPY_VERSION}/site-packages/ @comment lib/python${MODPY_VERSION}/site-packages/dbus/ @@ -8,8 +8,55 @@ @comment lib/qt4/plugins/designer/ share/doc/py-qt4/ share/doc/py-qt4/html/ +share/doc/py-qt4/html/_sources/ +share/doc/py-qt4/html/_sources/buffer_interface.txt +share/doc/py-qt4/html/_sources/build_system.txt +share/doc/py-qt4/html/_sources/dbus.txt +share/doc/py-qt4/html/_sources/deploy_commercial.txt +share/doc/py-qt4/html/_sources/designer.txt +share/doc/py-qt4/html/_sources/gotchas.txt +share/doc/py-qt4/html/_sources/i18n.txt +share/doc/py-qt4/html/_sources/incompatibilities.txt +share/doc/py-qt4/html/_sources/incompatible_apis.txt +share/doc/py-qt4/html/_sources/index.txt +share/doc/py-qt4/html/_sources/installation.txt +share/doc/py-qt4/html/_sources/introduction.txt +share/doc/py-qt4/html/_sources/keyword_arguments.txt +share/doc/py-qt4/html/_sources/new_style_signals_slots.txt +share/doc/py-qt4/html/_sources/old_style_signals_slots.txt +share/doc/py-qt4/html/_sources/pickle.txt +share/doc/py-qt4/html/_sources/python_shell.txt +share/doc/py-qt4/html/_sources/python_v3.txt +share/doc/py-qt4/html/_sources/qml.txt +share/doc/py-qt4/html/_sources/qsettings.txt +share/doc/py-qt4/html/_sources/qt_properties.txt +share/doc/py-qt4/html/_sources/qvariant.txt +share/doc/py-qt4/html/_sources/resources.txt +share/doc/py-qt4/html/_sources/webkit.txt +share/doc/py-qt4/html/_static/ +share/doc/py-qt4/html/_static/basic.css +share/doc/py-qt4/html/_static/default.css +share/doc/py-qt4/html/_static/doctools.js +share/doc/py-qt4/html/_static/file.png +share/doc/py-qt4/html/_static/jquery.js +share/doc/py-qt4/html/_static/logo.png +share/doc/py-qt4/html/_static/logo_tn.ico +share/doc/py-qt4/html/_static/minus.png +share/doc/py-qt4/html/_static/plus.png +share/doc/py-qt4/html/_static/pygments.css +share/doc/py-qt4/html/_static/searchtools.js +share/doc/py-qt4/html/_static/sidebar.js +share/doc/py-qt4/html/_static/underscore.js share/doc/py-qt4/html/assistant-manual.html +share/doc/py-qt4/html/buffer_interface.html +share/doc/py-qt4/html/build_system.html share/doc/py-qt4/html/classes.html +share/doc/py-qt4/html/dbus.html +share/doc/py-qt4/html/deploy_commercial.html +share/doc/py-qt4/html/designer.html +share/doc/py-qt4/html/genindex.html +share/doc/py-qt4/html/gotchas.html +share/doc/py-qt4/html/i18n.html share/doc/py-qt4/html/images/ share/doc/py-qt4/html/images/alphafill.png share/doc/py-qt4/html/images/assistant-toolbar.png @@ -388,7 +435,16 @@ share/doc/py-qt4/html/images/windowsxp-tableview.png share/doc/py-qt4/html/images/windowsxp-tabwidget.png share/doc/py-qt4/html/images/windowsxp-timeedit.png share/doc/py-qt4/html/images/windowsxp-treeview.png +share/doc/py-qt4/html/incompatibilities.html +share/doc/py-qt4/html/incompatible_apis.html +share/doc/py-qt4/html/index.html +share/doc/py-qt4/html/installation.html +share/doc/py-qt4/html/introduction.html +share/doc/py-qt4/html/keyword_arguments.html share/doc/py-qt4/html/modules.html +share/doc/py-qt4/html/new_style_signals_slots.html +share/doc/py-qt4/html/objects.inv +share/doc/py-qt4/html/old_style_signals_slots.html share/doc/py-qt4/html/phonon-abstractaudiooutput.html share/doc/py-qt4/html/phonon-abstractvideooutput.html share/doc/py-qt4/html/phonon-audiocapturedevice.html @@ -417,6 +473,10 @@ share/doc/py-qt4/html/phonon-videoplayer.html share/doc/py-qt4/html/phonon-videowidget.html share/doc/py-qt4/html/phonon-volumeslider.html share/doc/py-qt4/html/phonon.html +share/doc/py-qt4/html/pickle.html +share/doc/py-qt4/html/py-modindex.html +share/doc/py-qt4/html/python_shell.html +share/doc/py-qt4/html/python_v3.html share/doc/py-qt4/html/qabstractanimation.html share/doc/py-qt4/html/qabstractbutton.html share/doc/py-qt4/html/qabstracteventdispatcher.html @@ -488,6 +548,7 @@ share/doc/py-qt4/html/qcolordialog.html share/doc/py-qt4/html/qcolumnview.html share/doc/py-qt4/html/qcombobox.html share/doc/py-qt4/html/qcommandlinkbutton.html +share/doc/py-qt4/html/qcommonstyle.html share/doc/py-qt4/html/qcompleter.html share/doc/py-qt4/html/qconicalgradient.html share/doc/py-qt4/html/qcontextmenuevent.html @@ -778,6 +839,7 @@ share/doc/py-qt4/html/qmetaproperty.html share/doc/py-qt4/html/qmetatype.html share/doc/py-qt4/html/qmimedata.html share/doc/py-qt4/html/qmimesource.html +share/doc/py-qt4/html/qml.html share/doc/py-qt4/html/qmodelindex.html share/doc/py-qt4/html/qmouseevent.html share/doc/py-qt4/html/qmouseeventtransition.html @@ -861,6 +923,7 @@ share/doc/py-qt4/html/qpydesignercustomwidgetplugin.html share/doc/py-qt4/html/qpydesignermembersheetextension.html share/doc/py-qt4/html/qpydesignerpropertysheetextension.html share/doc/py-qt4/html/qpydesignertaskmenuextension.html +share/doc/py-qt4/html/qpynullvariant.html share/doc/py-qt4/html/qpytextobject.html share/doc/py-qt4/html/qquaternion.html share/doc/py-qt4/html/qradialgradient.html @@ -1036,6 +1099,7 @@ share/doc/py-qt4/html/qt-touchpointstates.html share/doc/py-qt4/html/qt-windowflags.html share/doc/py-qt4/html/qt-windowstates.html share/doc/py-qt4/html/qt.html +share/doc/py-qt4/html/qt_properties.html share/doc/py-qt4/html/qtabbar.html share/doc/py-qt4/html/qtabletevent.html share/doc/py-qt4/html/qtableview.html @@ -1052,7 +1116,6 @@ share/doc/py-qt4/html/qtcpsocket.html share/doc/py-qt4/html/qtdeclarative.html share/doc/py-qt4/html/qtdesigner.html share/doc/py-qt4/html/qtemporaryfile.html -share/doc/py-qt4/html/qtest-qtoucheventsequence.html share/doc/py-qt4/html/qtest.html share/doc/py-qt4/html/qtextblock-iterator.html share/doc/py-qt4/html/qtextblock.html @@ -1229,6 +1292,38 @@ share/doc/py-qt4/html/qxmlstreamnamespacedeclaration.html share/doc/py-qt4/html/qxmlstreamnotationdeclaration.html share/doc/py-qt4/html/qxmlstreamreader.html share/doc/py-qt4/html/qxmlstreamwriter.html +share/doc/py-qt4/html/resources.html +share/doc/py-qt4/html/search.html +share/doc/py-qt4/html/searchindex.js share/doc/py-qt4/html/threads.html -share/doc/py-qt4/pyqt4ref.html -share/doc/py-qt4/pyqt4ref.txt +share/doc/py-qt4/html/webkit.html +share/doc/py-qt4/sphinx/ +share/doc/py-qt4/sphinx/buffer_interface.rst +share/doc/py-qt4/sphinx/build_system.rst +share/doc/py-qt4/sphinx/conf.py +share/doc/py-qt4/sphinx/dbus.rst +share/doc/py-qt4/sphinx/deploy_commercial.rst +share/doc/py-qt4/sphinx/designer.rst +share/doc/py-qt4/sphinx/gotchas.rst +share/doc/py-qt4/sphinx/i18n.rst +share/doc/py-qt4/sphinx/incompatibilities.rst +share/doc/py-qt4/sphinx/incompatible_apis.rst +share/doc/py-qt4/sphinx/index.rst +share/doc/py-qt4/sphinx/installation.rst +share/doc/py-qt4/sphinx/introduction.rst +share/doc/py-qt4/sphinx/keyword_arguments.rst +share/doc/py-qt4/sphinx/new_style_signals_slots.rst +share/doc/py-qt4/sphinx/old_style_signals_slots.rst +share/doc/py-qt4/sphinx/pickle.rst +share/doc/py-qt4/sphinx/python_shell.rst +share/doc/py-qt4/sphinx/python_v3.rst +share/doc/py-qt4/sphinx/qml.rst +share/doc/py-qt4/sphinx/qsettings.rst +share/doc/py-qt4/sphinx/qt_properties.rst +share/doc/py-qt4/sphinx/qvariant.rst +share/doc/py-qt4/sphinx/resources.rst +share/doc/py-qt4/sphinx/static/ +share/doc/py-qt4/sphinx/static/default.css +share/doc/py-qt4/sphinx/static/logo.png +share/doc/py-qt4/sphinx/static/logo_tn.ico +share/doc/py-qt4/sphinx/webkit.rst diff --git a/x11/py-qt4/pkg/PLIST-main b/x11/py-qt4/pkg/PLIST-main index 26a9fffd49e..51e228ed81b 100644 --- a/x11/py-qt4/pkg/PLIST-main +++ b/x11/py-qt4/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.11 2011/01/16 15:26:28 jasper Exp $ +@comment $OpenBSD: PLIST-main,v 1.12 2011/05/17 08:38:33 dcoppa Exp $ @bin bin/pylupdate4 @bin bin/pyrcc4 bin/pyuic4 @@ -148,6 +148,7 @@ share/sip/QtCore/qpluginloader.sip share/sip/QtCore/qpoint.sip share/sip/QtCore/qprocess.sip share/sip/QtCore/qpropertyanimation.sip +share/sip/QtCore/qpynullvariant.sip share/sip/QtCore/qreadwritelock.sip share/sip/QtCore/qrect.sip share/sip/QtCore/qregexp.sip @@ -236,6 +237,7 @@ share/sip/QtGui/qcolordialog.sip share/sip/QtGui/qcolumnview.sip share/sip/QtGui/qcombobox.sip share/sip/QtGui/qcommandlinkbutton.sip +share/sip/QtGui/qcommonstyle.sip share/sip/QtGui/qcompleter.sip share/sip/QtGui/qcursor.sip share/sip/QtGui/qdatawidgetmapper.sip @@ -496,7 +498,6 @@ share/sip/QtTest/qtestcase.sip share/sip/QtTest/qtestkeyboard.sip share/sip/QtTest/qtestmouse.sip share/sip/QtTest/qtestsystem.sip -share/sip/QtTest/qtesttouch.sip share/sip/QtWebKit/ share/sip/QtWebKit/QtWebKitmod.sip share/sip/QtWebKit/qgraphicswebview.sip