[espresso] Added patch for building with cython-0.22

Thomas Spura tomspur at fedoraproject.org
Thu Mar 12 19:57:44 UTC 2015


commit 8068826c39558dc472d0a5fc1c5e1b54ce34e9f6
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Thu Mar 12 20:54:31 2015 +0100

    Added patch for building with cython-0.22

 espresso-cython-022.patch | 20 ++++++++++++++++++++
 espresso.spec             |  4 ++++
 2 files changed, 24 insertions(+)
---
diff --git a/espresso-cython-022.patch b/espresso-cython-022.patch
new file mode 100644
index 0000000..b362668
--- /dev/null
+++ b/espresso-cython-022.patch
@@ -0,0 +1,20 @@
+From 9e6caa3294b0f5f377c16550a07429b73c871ac3 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans at votca.org>
+Date: Thu, 12 Mar 2015 08:55:51 -0600
+Subject: [PATCH] fix build with cython-0.22
+
+---
+ src/python/espressomd/particle_data.pxd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/python/espressomd/particle_data.pxd b/src/python/espressomd/particle_data.pxd
+index fff022b..4cc39e8 100644
+--- a/src/python/espressomd/particle_data.pxd
++++ b/src/python/espressomd/particle_data.pxd
+@@ -185,5 +185,5 @@ cdef class ParticleHandle(object):
+   cdef public int id
+   cdef bint valid
+   cdef Particle particleData
+-  cdef int updateParticleData(self)
++  cdef int updateParticleData(self) except -1
+ 
diff --git a/espresso.spec b/espresso.spec
index 8fb925c..f330e28 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -28,6 +28,8 @@ Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://espressomd.org
 Source0:        http://download.savannah.gnu.org/releases/espressomd/espresso-%{version}.tar.gz
+# upstream commit from https://github.com/espressomd/espresso/pull/214
+Patch0:         espresso-cython-022.patch
 # run autoreconf for aarch64 support
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -103,6 +105,7 @@ This package contains %{name} compiled against MPICH2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 #sed -i 's/tclsh8\.4/tclsh/' tools/trace_memory.tcl
 
@@ -207,6 +210,7 @@ popd
 %changelog
 * Thu Mar 12 2015 Thomas Spura <tomspur at fedoraproject.org> - 3.3.0-3
 - Rebuild for changed mpich libraries
+- Added patch for building with cython-0.22
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


More information about the scm-commits mailing list