Mailinglist Archive: opensuse-commit (1670 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package python-vorbis
checked in at Sat Oct 21 21:38:43 CEST 2006.

--------
--- python-vorbis/python-vorbis.changes	2006-02-28 16:46:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/python-vorbis/python-vorbis.changes	2006-10-20 15:39:51.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 20 15:39:19 CEST 2006 - jmatejek@xxxxxxx
+
+- fixed a bug and minor incompatibilities for 64bit PEP353 changes
+
+-------------------------------------------------------------------

New:
----
  pyvorbis-1.3-ssize.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-vorbis.spec ++++++
--- /var/tmp/diff_new_pack.wkqxYQ/_old	2006-10-21 21:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.wkqxYQ/_new	2006-10-21 21:38:34.000000000 +0200
@@ -15,11 +15,12 @@
 %define dist_name pyvorbis
 %define _prefix /usr
 Version:        1.3
-Release:        168
-License:        LGPL
+Release:        188
+License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Summary:        Python bindings for libvorbis
 Source:         %{dist_name}-%{version}.tar.bz2
 Source1:        Setup.in
+Patch0:         pyvorbis-1.3-ssize.patch
 Group:          Development/Libraries/Python
 %define pyver %(python -c 'import sys; print sys.version[:3]')
 Requires:       python >= %pyver, python < %{pyver}.99
@@ -35,6 +36,7 @@
 
 %prep
 %setup -n %{dist_name}-%{version}
+%patch0
 sed -e 's$@libdir@$%{_libdir}$g' -e 's$@includedir@$%{_includedir}$g' %{SOURCE1} >Setup
 
 %build
@@ -51,6 +53,8 @@
 %doc AUTHORS ChangeLog PKG-INFO COPYING NEWS README
 
 %changelog -n python-vorbis
+* Fri Oct 20 2006 - jmatejek@xxxxxxx
+- fixed a bug and minor incompatibilities for 64bit PEP353 changes
 * Tue Feb 28 2006 - jmatejek@xxxxxxx
 - updated to reflect python changes due to #149809
 * Wed Jan 25 2006 - mls@xxxxxxx


++++++ pyvorbis-1.3-ssize.patch ++++++
--- src/pyvorbiscodec.c
+++ src/pyvorbiscodec.c
@@ -231,7 +231,7 @@
 {
   PyObject *cur;
   int k;
-  int len = -1;
+  Py_ssize_t len = -1;
 
   for (k = 0; k < size; k++) {
     cur = PyTuple_GET_ITEM(args, k);
@@ -245,7 +245,7 @@
       if (PyString_Size(cur) != len)
 	return DIFF_LENGTHS;
   }
-  return len;
+  return (len > INT_MAX) ? INT_MAX : len;
 }
 
 static PyObject *
@@ -272,7 +272,7 @@
   if (PyTuple_Size(args) != channels) {
     snprintf(err_msg, sizeof(err_msg), 
 	     "Expected %d strings as arguments; found %d arguments",
-	     channels, PyTuple_Size(args));
+	     channels, Py_SAFE_DOWNCAST(PyTuple_Size(args),Py_ssize_t,int));
     PyErr_SetString(Py_VorbisError, err_msg);
     return NULL;
   }
--- src/pyvorbisinfo.c
+++ src/pyvorbisinfo.c
@@ -265,7 +265,7 @@
 static PyObject *py_comment_subscript(py_vcomment *, PyObject *);
 
 static PyMappingMethods py_vcomment_Mapping_Methods = {
-  (inquiry) py_comment_length,
+  (lenfunc) py_comment_length,
   (binaryfunc) py_comment_subscript,
   (objobjargproc) py_comment_assign
 };
@@ -553,7 +553,7 @@
 static PyObject *
 py_comment_items(PyObject *self, PyObject *args)
 {
-  int curitem, curpos, j;
+  Py_ssize_t curitem, curpos, j;
   PyObject *key, *val, *curval, *tuple;
   PyObject *retlist;
   PyObject *dict;
@@ -591,7 +591,7 @@
 static PyObject *
 py_comment_values(PyObject *self, PyObject *args)
 {
-  int curitem, curpos, j;
+  Py_ssize_t curitem, curpos, j;
   PyObject *key, *val, *curval;
   PyObject *retlist;
   PyObject *dict;
@@ -768,7 +768,7 @@
   if (PyString_Check(item_vals)) {
     return assign_tag(vcomment, key, item_vals);
   } else if (PySequence_Check(item_vals)) {
-    int j, val_length = PySequence_Length(item_vals);
+    Py_ssize_t j, val_length = PySequence_Length(item_vals);
     if (!pystrcasecmp(key, "vendor") && val_length > 1) {
       PyErr_SetString(PyExc_ValueError, "Cannot have multiple vendor tags");
     }
@@ -792,7 +792,7 @@
   vorbis_comment *vcomment = NULL;
   int initted = 0;
   PyObject *items = NULL;
-  int k, length;
+  Py_ssize_t k, length;
 
   vcomment = (vorbis_comment *) malloc(sizeof(vorbis_comment));
   if (!vcomment) {

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx