diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2009-06-01 19:33:34 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2009-06-01 19:33:34 +0000 |
| commit | 17247591609432b6588464352662741b32e29a6e (patch) | |
| tree | 17f60abaa35e7b20d2770452b8ea3e1bc324180a /dev-python | |
| parent | old (diff) | |
| download | gentoo-2-17247591609432b6588464352662741b32e29a6e.tar.gz gentoo-2-17247591609432b6588464352662741b32e29a6e.tar.bz2 gentoo-2-17247591609432b6588464352662741b32e29a6e.zip | |
Add missing patch. Fixes bug 272126
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/fix_license_check.patch | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 9b1706a7578b..7d81ae49c606 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.57 2009/06/01 16:30:48 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.58 2009/06/01 19:33:34 hwoarang Exp $ + + 01 Jun 2009; Markos Chandras <hwoarang@gentoo.org> + +files/fix_license_check.patch: + Add missing patch. Fixes bug 272126 *PyQt4-4.4.4-r5 (01 Jun 2009) diff --git a/dev-python/PyQt4/files/fix_license_check.patch b/dev-python/PyQt4/files/fix_license_check.patch new file mode 100644 index 000000000000..fac973d45f68 --- /dev/null +++ b/dev-python/PyQt4/files/fix_license_check.patch @@ -0,0 +1,14 @@ +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: |