[Python-modules-commits] r25661 - in packages/python-qt4/trunk/debian (6 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Thu Aug 22 04:39:19 UTC 2013
Date: Thursday, August 22, 2013 @ 04:39:13
Author: kitterman
Revision: 25661
* New upstream release
- Bump minumum build-dep version for python/3-sip to 4.15
- Remove debian/patches/qreal_float_support.diff, alternate solution
implemented upstream
- Refresh patches
* Bump minimum version for python/3-all-dev to those that support the
simplified build target introduced in the last upload. (Closes: #718733)
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
packages/python-qt4/trunk/debian/patches/series
Deleted:
packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/changelog 2013-08-22 04:39:13 UTC (rev 25661)
@@ -1,9 +1,14 @@
-python-qt4 (4.10.2-3) UNRELEASED; urgency=low
+python-qt4 (4.10.3-1) experimental; urgency=low
- * Bump minimum versions for python-all-dev and python3-all-dev
- (Closes: # 718733)
+ * New upstream release
+ - Bump minumum build-dep version for python/3-sip to 4.15
+ - Remove debian/patches/qreal_float_support.diff, alternate solution
+ implemented upstream
+ - Refresh patches
+ * Bump minimum version for python/3-all-dev to those that support the
+ simplified build target introduced in the last upload. (Closes: #718733)
- -- Scott Kitterman <scott at kitterman.com> Mon, 05 Aug 2013 19:30:15 -0400
+ -- Scott Kitterman <scott at kitterman.com> Wed, 21 Aug 2013 23:26:38 -0400
python-qt4 (4.10.2-2) unstable; urgency=low
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/control 2013-08-22 04:39:13 UTC (rev 25661)
@@ -18,16 +18,16 @@
python-all-dbg,
python-all-dev (>= 2.7.5-1~),
python3-all-dbg,
- python3-all-dev (>= 3.3.2-5),
+ python3-all-dev (>= 3.3),
python-dbus (>= 1.0.0~),
python-dbus-dbg,
python3-dbus,
python3-dbus-dbg,
python-dbus-dev,
python-sip-dbg,
- python-sip-dev (>= 4.14.4),
+ python-sip-dev (>= 4.15),
python3-sip-dbg,
- python3-sip-dev (>= 4.14.4),
+ python3-sip-dev (>= 4.15),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python3.2-dev (<< 3.2.3-8~), python2.7-dev (<< 2.7.5-2~)
Standards-Version: 3.9.4
Modified: packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2013-08-22 04:39:13 UTC (rev 25661)
@@ -7,11 +7,11 @@
Reviewed-By: Scott Kitterman <scott at kitterman.cm>
Last-Update: <2012-10-21>
-Index: python-qt4-4.10.1/configure.py
+Index: python-qt4-4.10.3/configure.py
===================================================================
---- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:04:06.603388925 -0400
-+++ python-qt4-4.10.1/configure.py 2013-05-08 01:04:06.599388925 -0400
-@@ -795,6 +795,9 @@
+--- python-qt4-4.10.3.orig/configure.py 2013-08-21 23:31:38.072871657 -0400
++++ python-qt4-4.10.3/configure.py 2013-08-21 23:31:38.064871658 -0400
+@@ -797,6 +797,9 @@
if sipcfg.py_conf_inc_dir != sipcfg.py_inc_dir:
inc_path.insert(0, sipcfg.py_conf_inc_dir)
@@ -21,7 +21,7 @@
if opts.bigqt:
api_dir = "../../_qt"
else:
-@@ -950,7 +953,10 @@
+@@ -948,7 +951,10 @@
dynamic_pylib = "--enable-shared" in config_args
if dynamic_pylib:
@@ -33,7 +33,7 @@
lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
-@@ -981,7 +987,6 @@
+@@ -979,7 +985,6 @@
prj = fin.read()
fin.close()
Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-08-22 04:39:13 UTC (rev 25661)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.10.1/configure.py
+Index: python-qt4-4.10.3/configure.py
===================================================================
---- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:03:59.523389111 -0400
-+++ python-qt4-4.10.1/configure.py 2013-05-08 01:03:59.519389111 -0400
-@@ -861,31 +861,6 @@
+--- python-qt4-4.10.3.orig/configure.py 2013-08-21 23:31:24.192872067 -0400
++++ python-qt4-4.10.3/configure.py 2013-08-21 23:31:24.184872068 -0400
+@@ -863,31 +863,6 @@
makefile.generate()
tool.append("dbus")
@@ -34,7 +34,7 @@
# The pyuic directory may not exist if we are building away from the
# source directory.
try:
-@@ -894,7 +869,6 @@
+@@ -896,7 +871,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -903,7 +877,6 @@
+@@ -905,7 +879,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Deleted: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2013-08-22 04:39:13 UTC (rev 25661)
@@ -1,248 +0,0 @@
-## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.10.1/configure.py
-===================================================================
---- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:03:51.043389333 -0400
-+++ python-qt4-4.10.1/configure.py 2013-05-08 01:03:51.035389333 -0400
-@@ -2161,8 +2161,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.10.1/sip/QtCore/qlist.sip
-===================================================================
---- python-qt4-4.10.1.orig/sip/QtCore/qlist.sip 2013-05-08 01:03:51.043389333 -0400
-+++ python-qt4-4.10.1/sip/QtCore/qlist.sip 2013-05-08 01:03:51.039389333 -0400
-@@ -807,3 +807,227 @@
- return sipGetState(sipTransferObj);
- %End
- };
-+
-+// If we're on an architecture where qreal != double, then we need to also
-+// explicately handle doubles. On architectures where qreal == double, they
-+// will automaticially be cast upwards
-+
-+%If (!PyQt_qreal_double)
-+
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
-+%MappedType QList<QPair<double, double> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ const QPair<double, double> &p = sipCpp->at(i);
-+ PyObject *pobj;
-+
-+ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
-+ {
-+ Py_DECREF(l);
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
-+
-+ ql->append(QPair<double, double>(first, second));
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
-+template<double, TYPE>
-+%MappedType QList<QPair<double, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ const QPair<double, TYPE> &p = sipCpp->at(i);
-+ TYPE *t = new TYPE(p.second);
-+ PyObject *pobj;
-+
-+ if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL)
-+ {
-+ Py_DECREF(l);
-+ delete t;
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+ return 0;
-+
-+ if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE))
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+ double d;
-+ int state;
-+
-+ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
-+ if (*sipIsErr)
-+ {
-+ sipReleaseInstance(t, sipClass_TYPE, state);
-+
-+ delete ql;
-+ return 0;
-+ }
-+
-+ ql->append(QPair<double, TYPE>(d, *t));
-+
-+ sipReleaseInstance(t, sipClass_TYPE, state);
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+
-+// QList<double> is implemented as a Python list of doubles.
-+%MappedType QList<double>
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ PyObject *pobj;
-+
-+ if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL)
-+ {
-+ Py_DECREF(l);
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0);
-+
-+ QList<double> *ql = new QList<double>;
-+ SIP_SSIZE_T len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+
-+%End
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2013-08-21 21:30:42 UTC (rev 25660)
+++ packages/python-qt4/trunk/debian/patches/series 2013-08-22 04:39:13 UTC (rev 25661)
@@ -1,3 +1,2 @@
-qreal_float_support.diff
debian_configure_changes.diff
config_extra_headers.diff
More information about the Python-modules-commits
mailing list