Hello community,

here is the log from the commit of package python-Kivy for openSUSE:Factory 
checked in at 2014-11-13 09:17:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Kivy (Old)
 and      /work/SRC/openSUSE:Factory/.python-Kivy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-Kivy"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Kivy/python-Kivy.changes  2014-02-22 
18:16:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Kivy.new/python-Kivy.changes     
2014-11-13 09:17:29.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Nov 10 22:23:06 UTC 2014 - dims...@opensuse.org
+
+- Replace python-imaging BuildRequires and Requires with
+  python-Pillow: The code actually does 'from PIL import image', so
+  pythom-imaging would not even work.
+
+-------------------------------------------------------------------
+Thu Oct 16 16:08:57 UTC 2014 - dims...@opensuse.org
+
+- Add python-Kivy-Cython-0.21.patch: Fix build with Cython 0.21.
+
+-------------------------------------------------------------------

New:
----
  python-Kivy-Cython-0.21.patch

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

Other differences:
------------------
++++++ python-Kivy.spec ++++++
--- /var/tmp/diff_new_pack.YXGngD/_old  2014-11-13 09:17:31.000000000 +0100
+++ /var/tmp/diff_new_pack.YXGngD/_new  2014-11-13 09:17:31.000000000 +0100
@@ -24,19 +24,21 @@
 License:        LGPL-3.0
 Group:          Development/Languages/Python
 Source:         
http://pypi.python.org/packages/source/K/Kivy/Kivy-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM python-Kivy-Cython-0.21.patch dims...@opensuse.org -- Fix 
build with Cython 0.21, taken from git
+Patch0:         python-Kivy-Cython-0.21.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
 BuildRequires:  fdupes
 BuildRequires:  mtdev
 BuildRequires:  python-Cython
+BuildRequires:  python-Pillow
 BuildRequires:  python-Sphinx
 BuildRequires:  python-devel
-BuildRequires:  python-imaging
 BuildRequires:  python-opengl
 BuildRequires:  python-pyenchant
 BuildRequires:  python-pygame
 Requires:       mtdev
-Requires:       python-imaging
+Requires:       python-Pillow
 Requires:       python-opengl
 Requires:       python-pyenchant
 Requires:       python-pygame
@@ -64,6 +66,7 @@
 
 %prep
 %setup -q -n Kivy-%{version}
+%patch0 -p1
 sed -i "s|data_file_prefix = 'share/kivy-'|data_file_prefix = 
'%{_docdir}/%{name}/'|" setup.py
 sed -i "s|#!/usr/bin/python||" kivy/lib/osc/OSC.py # Fix non-executable script
 rm examples/demo/pictures/images/.empty # Remove empty file

++++++ python-Kivy-Cython-0.21.patch ++++++
>From 827bd6c7b7d04ec72cb3bdbf0ffcd90630d90008 Mon Sep 17 00:00:00 2001
From: Matthew Einhorn <moiein2...@gmail.com>
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, <char 
*><bytes>attr.name)
+                name = <bytes>attr.name
+                attr.index = glGetAttribLocation(self.program, <char *>name)
                 glEnableVertexAttribArray(attr.index)
 
         # save for the next run.
-- 
2.1.2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to