diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-16 21:58:54 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-16 21:58:54 +0000 |
| commit | 3991a6273d55f701d596170fed5a427689f7a8b9 (patch) | |
| tree | df16d5f070503bf7bd1340f7838e0434e53da9fc /dev-vcs/tortoisehg/files/2.7.1-qtversion.patch | |
| parent | old (diff) | |
| download | historical-3991a6273d55f701d596170fed5a427689f7a8b9.tar.gz historical-3991a6273d55f701d596170fed5a427689f7a8b9.tar.bz2 historical-3991a6273d55f701d596170fed5a427689f7a8b9.zip | |
Add patch to fix silent failure with PyQt4-4.10.
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-vcs/tortoisehg/files/2.7.1-qtversion.patch')
| -rw-r--r-- | dev-vcs/tortoisehg/files/2.7.1-qtversion.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch b/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch new file mode 100644 index 000000000000..aaa5b0f573d3 --- /dev/null +++ b/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch @@ -0,0 +1,23 @@ +# HG changeset patch +# User Steve Borho <steve@borho.org> +# Date 1362690570 21600 +# Branch stable +# Node ID e571f9b3eadc2e2706bd350dab33d3bee5bf2315 +# Parent 6fbbe3d1974c267e5a30e4d9d1efc54a24fd1f35 +qt: use int comparison for Qt and PyQt version check (fixes #2467) + +diff --git a/tortoisehg/hgqt/qtlib.py b/tortoisehg/hgqt/qtlib.py +--- a/tortoisehg/hgqt/qtlib.py ++++ b/tortoisehg/hgqt/qtlib.py +@@ -25,9 +25,8 @@ + from PyQt4.QtCore import * + from PyQt4.QtGui import * + +-if PYQT_VERSION_STR.split('.') < ['4', '6'] or \ +- QT_VERSION_STR.split('.') < ['4', '6']: +- sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.7\n') ++if PYQT_VERSION < 0x40600 or QT_VERSION < 0x40600: ++ sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.6\n') + sys.stderr.write('You have Qt %s and PyQt %s\n' % + (QT_VERSION_STR, PYQT_VERSION_STR)) + sys.exit() |