summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2013-12-28 18:46:22 +0000
committerSteve Arnold <nerdboy@gentoo.org>2013-12-28 18:46:22 +0000
commitbf361375b71a3c9e2c3c9cd6227094d8c4d0e16e (patch)
tree3771370c5562e4801bc77e569306be5993706d9a
parent3.16-r1 is stable long enough to remove 3.16 using deprecated distutils (diff)
downloadgentoo-2-bf361375b71a3c9e2c3c9cd6227094d8c4d0e16e.tar.gz
gentoo-2-bf361375b71a3c9e2c3c9cd6227094d8c4d0e16e.tar.bz2
gentoo-2-bf361375b71a3c9e2c3c9cd6227094d8c4d0e16e.zip
Updated qreal_float patch (for arm) to remove obsolete hunk.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )
-rw-r--r--dev-python/PyQt4/ChangeLog7
-rw-r--r--dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch15
2 files changed, 6 insertions, 16 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 2bbe48b50b73..003211cffbe4 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.247 2013/12/25 21:00:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.248 2013/12/28 18:46:22 nerdboy Exp $
+
+ 28 Dec 2013; Steve Arnold <nerdboy@gentoo.org>
+ files/PyQt4-4.7.3-qreal_float_support.patch:
+ Updated qreal_float patch to remove first hunk (already applied
+ upstream). Tested on arm chromebook; no existing bug.
*PyQt4-4.10.3-r2 (25 Dec 2013)
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
index 958fe56cb09b..37e1e69eb3f4 100644
--- a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
+++ b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
@@ -5,21 +5,6 @@
## to qlist.sip on architectures where qreal != double
@DPATCH@
-Index: python-qt4-4.7.2/configure.py
-===================================================================
---- python-qt4-4.7.2.orig/configure.py 2010-03-17 19:29:19.000000000 +0100
-+++ python-qt4-4.7.2/configure.py 2010-03-25 23:53:55.468631945 +0100
-@@ -1915,8 +1915,9 @@
- out << "PyQt_NoOpenGLES\\n";
- #endif
-
-- if (sizeof (qreal) != sizeof (double))
-+#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
- out << "PyQt_qreal_double\\n";
-+#endif
-
- return 0;
- }
Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
===================================================================
--- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip 2010-03-17 19:29:26.000000000 +0100