aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2013-09-24 12:56:54 +0200
committerRobby Workman <rworkman@slackbuilds.org>2013-11-11 10:58:08 -0600
commit24aac0d4f73770accbbd75e1ea35790978bab71d (patch)
tree9218606411c6c370d51a26a4d0756c85b0520bd6
parent955db179564d5afda7566fe35028704cfe1404f6 (diff)
audio/xmms2: Added a fix needed when built over Cython.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--audio/xmms2/xmms2-0.8-cython-0.19.1.patch47
-rw-r--r--audio/xmms2/xmms2.SlackBuild5
2 files changed, 51 insertions, 1 deletions
diff --git a/audio/xmms2/xmms2-0.8-cython-0.19.1.patch b/audio/xmms2/xmms2-0.8-cython-0.19.1.patch
new file mode 100644
index 0000000000000..1d6e59f6c8307
--- /dev/null
+++ b/audio/xmms2/xmms2-0.8-cython-0.19.1.patch
@@ -0,0 +1,47 @@
+From 6d6d7a7ee38c8e3f57242f2510e06a03f4e7e249 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 5 Aug 2013 22:29:46 +0300
+Subject: [PATCH] unbreak xmms2 building on cython-0.19.1
+
+Error compiling Cython file:
+------------------------------------------------------------
+...
+ def medialib_path_import(self, path, cb = None, encoded=False):
+ """
+ @deprecated
+ Use medialib_import_path(path, ...) instead
+ """
+ return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
+ ^
+
+Reported-by: ChunFeng
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/clients/lib/python/xmmsapi.pyx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/clients/lib/python/xmmsapi.pyx b/src/clients/lib/python/xmmsapi.pyx
+index 501a068..863db88 100644
+--- a/src/clients/lib/python/xmmsapi.pyx
++++ b/src/clients/lib/python/xmmsapi.pyx
+@@ -1364,7 +1364,7 @@ cdef class XmmsApi(XmmsCore):
+ @deprecated
+ Use medialib_import_path(path, ...) instead
+ """
+- return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
++ return self.medialib_import_path(path, cb=cb, encoded=encoded)
+
+ @deprecated
+ def medialib_path_import_encoded(self, path, cb = None):
+@@ -1372,7 +1372,7 @@ cdef class XmmsApi(XmmsCore):
+ @deprecated
+ Use medialib_import_path(path, ..., encoded=True) instead
+ """
+- return self.medialib_import_path(self, path, cb=cb, encoded=True)
++ return self.medialib_import_path(path, cb=cb, encoded=True)
+
+ cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None):
+ """
+--
+1.8.3.2
+
diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild
index 2dbe56fadf543..05e98fba2d6b4 100644
--- a/audio/xmms2/xmms2.SlackBuild
+++ b/audio/xmms2/xmms2.SlackBuild
@@ -8,7 +8,7 @@
PRGNAM=xmms2
VERSION="0.8DrO_o"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -55,6 +55,9 @@ chmod -R u+w,go+r-w,a-s .
# This fixes building over the newer ffmpeg
sed -i "s|^\ \ \ \ flags\.enable_c_error.*||" wscript
+# unbreak xmms2 building on cython-0.19.1
+patch -p1 < $CWD/xmms2-0.8-cython-0.19.1.patch
+
export CCFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"