python-pyqt4: upgrade to 4.0 final version

2 files changed, 5 insertions, 101 deletions

diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch
deleted file mode 100644
index 032824e39d..0000000000
--- a/packages/python/python-pyqt4/optional-features.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip
-@@ -21,7 +21,7 @@
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
--
-+%If (SessionManager)
- class QSessionManager : QObject
- {
- %TypeHeaderCode
-@@ -58,3 +58,4 @@
-     bool isPhase2() const;
-     void requestPhase2();
- };
-+%End
---- PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip
-@@ -20,7 +20,7 @@
- // You should have received a copy of the GNU General Public License along with
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-+%Feature SessionManager
- 
- // QApplication *qApp
- QApplication *qApp;
-@@ -101,7 +101,9 @@
-             {sipName_QStandardItemModel,	&sipClass_QStandardItemModel,	-1, 8},
-             {sipName_QLayout,	&sipClass_QLayout,	27, 9},
-             {sipName_QTextObject,	&sipClass_QTextObject,	32, 10},
-+#ifndef QT_NO_SESSIONMANAGER
-             {sipName_QSessionManager,	&sipClass_QSessionManager,	-1, 11},
-+#endif
-             {sipName_QWidget,	&sipClass_QWidget,	36, 12},
-             {sipName_QMovie,	&sipClass_QMovie,	-1, 13},
-             {sipName_QAbstractProxyModel,	&sipClass_QAbstractProxyModel,	100, 14},
-@@ -357,11 +359,13 @@
-     static bool isLeftToRight();
-     static bool isEffectEnabled(Qt::UIEffect);
-     static void setEffectEnabled(Qt::UIEffect, bool enable = true);
-+%If (SessionManager)
-     bool isSessionRestored() const;
-     QString sessionId() const;
-     QString sessionKey() const;
-     virtual void commitData(QSessionManager &sm);
-     virtual void saveState(QSessionManager &sm);
-+%End
-     void setInputContext(QInputContext *);
-     QInputContext *inputContext() const;
-     static int exec() /PostHook=__pyQtPostEventLoopHook__, PreHook=__pyQtPreEventLoopHook__, PyName=exec_, ReleaseGIL/;
---- PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip
-@@ -20,7 +20,10 @@
- // You should have received a copy of the GNU General Public License along with
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-+%Feature Accessibility
-+%Feature ToolTips
-+%Feature StatusTips
-+%Feature WhatsThis
- 
- class QWidget : QObject, QPaintDevice
- {
-@@ -128,16 +131,24 @@
-     void setWindowOpacity(qreal level);
-     qreal windowOpacity() const;
-     bool isWindowModified() const;
-+%If (ToolTips)
-     void setToolTip(const QString &);
-     QString toolTip() const;
-+%End
-+%If (StatusTips)
-     void setStatusTip(const QString &);
-     QString statusTip() const;
-+%End
-+%If (WhatsThis)
-     void setWhatsThis(const QString &);
-     QString whatsThis() const;
-+%End
-+%If (Accessibility)
-     QString accessibleName() const;
-     void setAccessibleName(const QString &name);
-     QString accessibleDescription() const;
-     void setAccessibleDescription(const QString &description);
-+%End
-     void setLayoutDirection(Qt::LayoutDirection direction);
-     Qt::LayoutDirection layoutDirection() const;
-     void unsetLayoutDirection();
diff --git a/packages/python/python-pyqt4_0.9.2.bb b/packages/python/python-pyqt4_4.0.bb
index 7af85af51c..6cd91e68ec 100644
--- a/packages/python/python-pyqt4_0.9.2.bb
+++ b/packages/python/python-pyqt4_4.0.bb
@@ -7,19 +7,18 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
-PR = "ml2"
+PR = "ml0"
 
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \
-           file://cross-compile.patch;patch=1 \
-           file://optional-features.patch;patch=1"
-S = "${WORKDIR}/PyQt4-gpl-4.0beta1"
+SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
+           file://cross-compile.patch;patch=1"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 inherit qmake qt4x11 sip4 distutils-base
 
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"