[gentoo-commits] gentoo-x86 commit in dev-python/pyvorbis/files: pyvorbis-1.4-python25.patch digest-pyvorbis-1.4-r3

[gentoo-commits] gentoo-x86 commit in dev-python/pyvorbis/files: pyvorbis-1.4-python25.patch digest-pyvorbis-1.4-r3

[Ali Polatel (hawking)]

hawking     07/09/19 23:37:54

  Modified:             pyvorbis-1.4-python25.patch
  Added:                digest-pyvorbis-1.4-r3
  Log:
  revision bump. change python-2.5 patch to work fine and apply it; bug 192858 thanks to Sean McLean
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.3                  dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch?r1=1.2&r2=1.3

Index: pyvorbis-1.4-python25.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyvorbis-1.4-python25.patch	19 Jul 2007 18:51:54 -0000	1.2
+++ pyvorbis-1.4-python25.patch	19 Sep 2007 23:37:54 -0000	1.3
@@ -1,12 +1,12 @@
-diff -ur pyvorbis-1.4.orig/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
---- pyvorbis-1.4.orig/src/pyvorbiscodec.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-07-19 20:13:59.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
+--- pyvorbis-1.4-old/src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
++++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-09-20 01:57:54.000000000 +0300
 @@ -118,7 +118,7 @@
  {
    vorbis_dsp_clear(PY_DSP(self));
    Py_XDECREF(((py_dsp *)self)->parent);
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject*
@@ -15,13 +15,13 @@
    vorbis_block_clear(PY_BLOCK(self));
    Py_XDECREF(((py_block *)self)->parent);
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject*
-diff -ur pyvorbis-1.4.orig/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
---- pyvorbis-1.4.orig/src/pyvorbisfile.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisfile.c	2007-07-19 20:25:27.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
+--- pyvorbis-1.4-old/src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisfile.c	2007-09-20 01:59:41.000000000 +0300
 @@ -173,8 +173,7 @@
    if (ret == NULL) {
      PyMem_DEL(newobj);
@@ -32,30 +32,25 @@
  
    return (PyObject *) newobj;
  }
-@@ -190,12 +189,9 @@
-     /* If file was opened from a file object, decref it, so it can
-        close */
-     Py_DECREF(py_self->py_file);
--  } else {
--    /* Otherwise, we opened the file and should close it. */
--    fclose(py_self->c_file);
+@@ -195,7 +194,8 @@
+     fclose(py_self->c_file);
    }
--
+ 
 -  PyMem_DEL(self);
 +  free(py_self->ovf);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject *
-diff -ur pyvorbis-1.4.orig/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
---- pyvorbis-1.4.orig/src/pyvorbisinfo.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-07-19 20:36:25.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
+--- pyvorbis-1.4-old/src/pyvorbisinfo.c	2003-12-19 09:51:36.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-09-20 02:01:58.000000000 +0300
 @@ -134,7 +134,7 @@
  static void
  py_ov_info_dealloc(PyObject *self)
  {
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  #define CMP_RET(x) \
@@ -64,7 +59,7 @@
    }
  
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  



1.1                  dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3?rev=1.1&content-type=text/plain

Index: digest-pyvorbis-1.4-r3
===================================================================
MD5 b4921e792c0a74f75b9d3057df10ee7c pyvorbis-1.4.tar.gz 39045
RMD160 c2e921f5f6deb4ebe3ff3ac8017f0f44c733b5ab pyvorbis-1.4.tar.gz 39045
SHA256 a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647 pyvorbis-1.4.tar.gz 39045



-- 
gentoo-commits@gentoo.org mailing list