On Sun, 09 Nov 2014, Bastian Venthur wrote:
> I'm currently unable to maintain the kivy package properly, as I am
> busy writing my Ph.D. Could I kindly ask you to take over this package?
> https://packages.qa.debian.org/k/kivy.html
I would not be able to take over and/or spend more time on migration, but I
am preparing upload addressing those fixes necessary for compatibility
with cython 0.21.1-1 and could request unblock
would it be ok meanwhile if I upload the NMU without delay?
PS good luck with the dissertation
here is the debdiff
diff -Nru kivy-1.8.0+dfsg/debian/changelog kivy-1.8.0+dfsg/debian/changelog
--- kivy-1.8.0+dfsg/debian/changelog2014-02-28 03:48:43.0 -0500
+++ kivy-1.8.0+dfsg/debian/changelog2014-11-09 10:23:02.0 -0500
@@ -1,3 +1,12 @@
+kivy (1.8.0+dfsg-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fixing FTBFS against cythoin 0.21.1 by cherry-picking upstream fix
+debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
+(Closes: #768828)
+
+ -- Yaroslav Halchenko Sun, 09 Nov 2014 10:11:22 -0500
+
kivy (1.8.0+dfsg-2) unstable; urgency=medium
* Provide python3-kivy package. The patch for that was provided by Vincent
diff -Nru
kivy-1.8.0+dfsg/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
kivy-1.8.0+dfsg/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
---
kivy-1.8.0+dfsg/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
1969-12-31 19:00:00.0 -0500
+++
kivy-1.8.0+dfsg/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
2014-11-09 10:16:01.0 -0500
@@ -0,0 +1,34 @@
+From 827bd6c7b7d04ec72cb3bdbf0ffcd90630d90008 Mon Sep 17 00:00:00 2001
+From: Matthew Einhorn
+Date: Thu, 17 Jul 2014 16:37:42 -0400
+Subject: [PATCH] Fix cython 'python temp coercion' exception.
+
+---
+ kivy/graphics/shader.pyx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kivy/graphics/shader.pyx b/kivy/graphics/shader.pyx
+index eab0f42..39c449a 100644
+--- a/kivy/graphics/shader.pyx
b/kivy/graphics/shader.pyx
+@@ -421,6 +421,7 @@ cdef class Shader:
+ cdef void bind_vertex_format(self, VertexFormat vertex_format):
+ cdef unsigned int i
+ cdef vertex_attr_t *attr
++cdef bytes name
+
+ # if the current vertex format used in the shader is the current one,
do
+ # nothing.
+@@ -445,7 +446,8 @@ cdef class Shader:
+ attr = &vertex_format.vattr[i]
+ if attr.per_vertex == 0:
+ continue
+-attr.index = glGetAttribLocation(self.program, attr.name)
++name = attr.name
++attr.index = glGetAttribLocation(self.program, name)
+ glEnableVertexAttribArray(attr.index)
+
+ # save for the next run.
+--
+2.1.1
+
diff -Nru kivy-1.8.0+dfsg/debian/patches/0001-Fixes-for-Cython-0.21.patch
kivy-1.8.0+dfsg/debian/patches/0001-Fixes-for-Cython-0.21.patch
--- kivy-1.8.0+dfsg/debian/patches/0001-Fixes-for-Cython-0.21.patch 1969-12-31
19:00:00.0 -0500
+++ kivy-1.8.0+dfsg/debian/patches/0001-Fixes-for-Cython-0.21.patch 2014-11-09
10:36:13.0 -0500
@@ -0,0 +1,36 @@
+From 90ddebab3f56c06175dd99b153383990434b9514 Mon Sep 17 00:00:00 2001
+From: Mathieu Virbel
+Date: Tue, 16 Sep 2014 10:11:23 +0200
+Subject: [PATCH] Fixes for Cython 0.21
+
+---
+ kivy/lib/gstplayer/_gstplayer.pyx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kivy/lib/gstplayer/_gstplayer.pyx
b/kivy/lib/gstplayer/_gstplayer.pyx
+index f07af0b..aa29c11 100644
+--- a/kivy/lib/gstplayer/_gstplayer.pyx
b/kivy/lib/gstplayer/_gstplayer.pyx
+@@ -207,7 +207,7 @@ cdef class GstPlayer:
+ self.eos_cb()
+
+ def load(self):
+-cdef char *c_uri
++cdef bytes py_uri
+
+ # if already loaded before, clean everything.
+ if self.pipeline != NULL:
+@@ -256,8 +256,8 @@ cdef class GstPlayer:
+
+ # configure playbin
+ g_object_set_int(self.pipeline, 'async-handling', 1)
+-c_uri = self.uri.encode('utf-8')
+-g_object_set_void(self.playbin, 'uri', c_uri)
++py_uri = self.uri.encode('utf-8')
++g_object_set_void(self.playbin, 'uri', py_uri)
+
+ # attach the callback
+ # NOTE no need to create a weakref here, as we manage to grab/release
+--
+2.1.1
+
diff -Nru kivy-1.8.0+dfsg/debian/patches/series
kivy-1.8.0+dfsg/debian/patches/series
--- kivy-1.8.0+dfsg/debian/patches/series 2014-02-28 03:38:07.0 -0500
+++ kivy-1.8.0+dfsg/debian/patches/series 2014-11-09 10:36:42.0 -0500
@@ -0,0 +1,2 @@
+0001-Fix-cython-python-temp-coercion-exception.patch
+0001-Fixes-for-Cython-0.21.patch
--
Yaroslav O. Halchenko, Ph.D.
http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org
Research Scientist,Psychological and Brain Sciences Dept.
Dartmouth College, 4
