diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-02-16 06:47:47 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-02-16 06:47:47 +0000 |
| commit | 6bb274b8a098bbebaa4771ed1c64143e00dc898c (patch) | |
| tree | 9996311c7ec951ffc258ecfe5bd4fc0d87f96f31 /dev-python | |
| parent | Drop old patches (diff) | |
| download | gentoo-2-6bb274b8a098bbebaa4771ed1c64143e00dc898c.tar.gz gentoo-2-6bb274b8a098bbebaa4771ed1c64143e00dc898c.tar.bz2 gentoo-2-6bb274b8a098bbebaa4771ed1c64143e00dc898c.zip | |
Drop old patches
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch | 16 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/fix_license_check.patch | 14 |
3 files changed, 6 insertions, 31 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 6ba4a9088127..f8be9e0291a1 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.108 2010/02/10 16:41:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.109 2010/02/16 06:47:45 abcd Exp $ + + 16 Feb 2010; Jonathan Callen <abcd@gentoo.org> + -files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch, + -files/fix_license_check.patch: + Drop old patches 10 Feb 2010; Jeroen Roovers <jer@gentoo.org> PyQt4-4.6.2.ebuild: Stable for HPPA (bug #300713). diff --git a/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch b/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch deleted file mode 100644 index 9c811b849ec5..000000000000 --- a/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip ---- PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip 2008-11-08 12:55:56.000000000 +0100 -+++ PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip 2009-04-21 21:59:09.938689971 +0200 -@@ -87,6 +87,12 @@ protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); -+ -+ virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event); -+ virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); -+ virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event); -+ virtual void dropEvent(QGraphicsSceneDragDropEvent *event); -+ - virtual void wheelEvent(QGraphicsSceneWheelEvent *event); - virtual void keyPressEvent(QKeyEvent *event); - virtual void keyReleaseEvent(QKeyEvent *event); diff --git a/dev-python/PyQt4/files/fix_license_check.patch b/dev-python/PyQt4/files/fix_license_check.patch deleted file mode 100644 index fac973d45f68..000000000000 --- a/dev-python/PyQt4/files/fix_license_check.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: configure.py -=================================================================== ---- configure.py -+++ configure.py -@@ -1469,7 +1469,8 @@ def check_license(): - # Common checks. - if qt_edition and ltype != "internal": - if qt_edition != "free" and ltype == "GPL": -- sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition) -+ if qt_edition != "Desktop": -+ sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition) - - # Confirm the license if not already done. - if not opts.license_confirmed: |