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 | 83769ea4b28f4abc62da1d834ef9d58666c066e9 (patch) | |
| tree | dd6235a21717e9fd8d1de07f27ee2633befbb836 /dev-python | |
| parent | old (diff) | |
| download | historical-83769ea4b28f4abc62da1d834ef9d58666c066e9.tar.gz historical-83769ea4b28f4abc62da1d834ef9d58666c066e9.tar.bz2 historical-83769ea4b28f4abc62da1d834ef9d58666c066e9.zip | |
Add missing patch. Fixes bug 272126
Package-Manager: portage-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/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/fix_license_check.patch | 14 |
3 files changed, 21 insertions, 2 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/Manifest b/dev-python/PyQt4/Manifest index ddd92b1267fb..1d2f348ca365 100644 --- a/dev-python/PyQt4/Manifest +++ b/dev-python/PyQt4/Manifest @@ -1,9 +1,10 @@ AUX PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch 1004 RMD160 5fa5609d31b53978846999be8045c75b940c3dd1 SHA1 a7122535d44bd8a81984870e98322b14521d2ced SHA256 db539a666d834756013fc48012914dd181116df7f5d1d21485ff947e20441eed AUX PyQt4-4.4_compile.patch 883 RMD160 016122f1e9cbf8c74da760fd094e280fd5ec0257 SHA1 b745edae97d52882b44a53461b98c96e11dbee20 SHA256 dc95ae5b5f7d07431d563c2035d68c6097b8f20dbb2285d2762066938c69e830 AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 df4fee27f1486422b25d0072cfc388b207814c8f SHA256 06ee44a9fe43615b6bfada4aa7294303c016fd7c378ddf537823e33546306926 +AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97 SHA1 41fa9b3962add04c8196695c9d9b82b69d7d3ea8 SHA256 117025432a5db37375554577c66edbe7a6fdef6e120fb865b2f4304961dc2c42 DIST PyQt-x11-gpl-4.4.4.tar.gz 6982063 RMD160 970bca082a93402b1986b4e8a14738575732e8ae SHA1 6b91a8020de10e807fa0d3db6b7a92029a17cf0b SHA256 fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a EBUILD PyQt4-4.4.4-r2.ebuild 2053 RMD160 2e558121c9279e447a7d81c30343e05f66584343 SHA1 b128d8cc5e13de8326a7743b9c0c7b24455227bf SHA256 88ae962727bf120178c1ee79c314848df812934b71ba908a1ff4a12dc5027535 EBUILD PyQt4-4.4.4-r4.ebuild 2221 RMD160 92a4e87f17f59f5cdb8ca7035bc4918ad58a4082 SHA1 7ab7ab501043dae45d2a60547425a70bef4a4ad8 SHA256 7cf7b42efb1482ee1522fabd2d0813b62bafb00d3c22214ebb6c99f8b0030596 EBUILD PyQt4-4.4.4-r5.ebuild 3057 RMD160 17ae90906de41cd5952725195d19b98668fda97a SHA1 5a458d1c629d144314da6de4f7c0dccba0fb6074 SHA256 e839cfd2f923eb3f8508a853c9eb56f61a3c38604df8ec1d6a0cc8402be2c648 -MISC ChangeLog 7882 RMD160 5ed6ae41573d1ac122a59327dc73cb6884fa1a46 SHA1 a4145001d1c6f638c0cac74b11fa3cae9d7c6e5b SHA256 e30295f251ffbf14bb57242456d6c225b12407ea686c91f096a721cb3402e2bc +MISC ChangeLog 8008 RMD160 4fec1b9606f7fd6d162ff0504c02a7a9b50c6a67 SHA1 26ec8944c1bf6338b99d8ace151f7b110029e6dc SHA256 4786b520e5b21b343e2ab727a4876c54fd726fa1ab04ca46c38155790d5b8c92 MISC metadata.xml 714 RMD160 8c740e56449b2453948683d998ac1eab67d1c329 SHA1 4ed693e5a1c25d8368933d70ba988da9b88d1122 SHA256 a42986a5a8e383a0931783fd49fb6bd0e79533ded138e15d4fbbdc5e355509c6 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: |