[arch-commits] Commit in xmms2/trunk (PKGBUILD remove-problem-depr.patch)

[Sergej Pupykin]

    Date: Tuesday, March 3, 2015 @ 16:40:53
  Author: spupykin
Revision: 128639

upgpkg: xmms2 0.8DrO_o-33

upd

Added:
  xmms2/trunk/remove-problem-depr.patch
Modified:
  xmms2/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   30 +++++++++++++++++-------------
 remove-problem-depr.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-03 15:35:48 UTC (rev 128638)
+++ PKGBUILD	2015-03-03 15:40:53 UTC (rev 128639)
@@ -3,7 +3,7 @@
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=32
+pkgrel=33
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64')
 url="http://xmms2.org/"
@@ -14,7 +14,8 @@
 	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
 	'libdiscid' 'libcdio-paranoia'
 	'libvorbis' 'libxml2' 'mpg123' 'perl' 'pulseaudio' 'pyrex'
-	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
+	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi'
+	'cython' 'cython2')
 optdepends=('alsa-lib: ALSA audio output'
 	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
 	    'boost: C++ language bindings'
@@ -52,21 +53,22 @@
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	"xmms2d.conf"
 	"xmms2d.service"
-	"ffmpeg2.0.patch")
+	"ffmpeg2.0.patch"
+	"remove-problem-depr.patch")
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
          '47e68461589578e8a99857746c5b6f29'
-         'da84ec58c5711f3c4ecd932c3e6642d6')
+         'da84ec58c5711f3c4ecd932c3e6642d6'
+         '5f8559e8bdad1d943b6843d85b3667ad')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ../ffmpeg2.0.patch
+  patch -Np1 -i ../remove-problem-depr.patch
 
-  # python2 fix
-  # sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf
-#  sed -i 's|#include <cdio/cdda.h>|#include <cdio/paranoia/cdda.h>|' src/plugins/cdda/cdda.c
-#  sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|' src/plugins/samba/{samba.c,wscript}
-#  sed -i 's|modplug.h|libmodplug/modplug.h|' src/plugins/modplug/modplug.c
+  sed -i 's|#include <cdio/cdda.h>|#include <cdio/paranoia/cdda.h>|' src/plugins/cdda/cdda.c
+  sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|' src/plugins/samba/{samba.c,wscript}
+  sed -i 's|modplug.h|libmodplug/modplug.h|' src/plugins/modplug/modplug.c
 
   # patch waf checks for ruby 2.2
   # https://code.google.com/p/waf/issues/detail?id=1524
@@ -86,13 +88,15 @@
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  ./waf --destdir=${pkgdir} install
 
+  # python2
+  ./waf distclean
+#  rm -f src/clients/lib/python/{xmmsvalue,xmmsapi}.c
+  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
+  ./waf build
   ./waf --destdir=${pkgdir} install
 
-#  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
-#  ./waf build
-#  ./waf --destdir=${pkgdir} install
-
   install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf
   install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service
 }

Added: remove-problem-depr.patch
===================================================================
--- remove-problem-depr.patch	                        (rev 0)
+++ remove-problem-depr.patch	2015-03-03 15:40:53 UTC (rev 128639)
@@ -0,0 +1,26 @@
+diff -wbBur xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx xmms2-0.8DrO_o.q/src/clients/lib/python/xmmsapi.pyx
+--- xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx	2011-10-20 23:26:08.000000000 +0400
++++ xmms2-0.8DrO_o.q/src/clients/lib/python/xmmsapi.pyx	2015-03-03 17:23:55.858103590 +0300
+@@ -1358,22 +1358,6 @@
+ 			res = xmmsc_medialib_import_path(self.conn, <char *>p)
+ 		return self.create_result(cb, res)
+ 
+-	@deprecated
+-	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)
+-
+-	@deprecated
+-	def medialib_path_import_encoded(self, path, cb = None):
+-		"""
+-		@deprecated
+-		Use medialib_import_path(path, ..., encoded=True) instead
+-		"""
+-		return self.medialib_import_path(self, path, cb=cb, encoded=True)
+-
+ 	cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None):
+ 		"""
+ 		medialib_property_set(id, key, value, source=None, cb=None) -> XmmsResult