[arch-commits] Commit in sonata/trunk (PKGBUILD sonata-cyr-input-fix.diff)

[Angel Velásquez]

    Date: Thursday, March 3, 2011 @ 07:31:43
  Author: angvp
Revision: 112050

upgpkg: sonata 1.6.2.1-5
Fixing FS#23119

Modified:
  sonata/trunk/PKGBUILD
Deleted:
  sonata/trunk/sonata-cyr-input-fix.diff

---------------------------+
 PKGBUILD                  |    9 +++------
 sonata-cyr-input-fix.diff |   18 ------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-03 11:49:18 UTC (rev 112049)
+++ PKGBUILD	2011-03-03 12:31:43 UTC (rev 112050)
@@ -4,7 +4,7 @@
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64')
 url="http://sonata.berlios.de/"
@@ -14,13 +14,10 @@
             'tagpy: Metadata editing support'
             'zsi: Lyrics fetching support'
             'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
-        sonata-cyr-input-fix.diff)
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
-         '7f6a96d41f41879f1c6aa6c40859d797')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz)
+md5sums=('0b912325e7175abad3bf6c0edc071e05')
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np1 -i $srcdir/sonata-cyr-input-fix.diff # FS#23023 
   python2 setup.py install --prefix=/usr --root="$pkgdir"
 }

Deleted: sonata-cyr-input-fix.diff
===================================================================
--- sonata-cyr-input-fix.diff	2011-03-03 11:49:18 UTC (rev 112049)
+++ sonata-cyr-input-fix.diff	2011-03-03 12:31:43 UTC (rev 112050)
@@ -1,18 +0,0 @@
-diff --git a/sonata/misc.py b/sonata/misc.py
-index c5e2dcf..42aaabd 100644
---- a/sonata/misc.py
-+++ b/sonata/misc.py
-@@ -222,7 +222,12 @@ def setlocale():
- 		locale.setlocale(locale.LC_ALL, "")
- 		# XXX this makes python-mpd correctly return lowercase
- 		# keys for, e.g., playlistinfo() with a turkish locale:
--		locale.setlocale(locale.LC_CTYPE, "C")
-+		# (and breaks playlist search with russian),
-+		# so, added check for turkish here.
-+		turkish = ('tr_TR',)
-+		loc, encoding = locale.getlocale()
-+		if loc in turkish:
-+			locale.setlocale(locale.LC_CTYPE, "C")
- 	except:
- 		print "Failed to set locale"
- 		sys.exit(1)