[arch-commits] Commit in cmus/trunk (ChangeLog PKGBUILD fix_format_print.patch)

[Eric Bélanger]

    Date: Monday, July 5, 2010 @ 22:23:10
  Author: eric
Revision: 84974

upgpkg: cmus 2.3.3-1
Upstream update, Removed old patch

Modified:
  cmus/trunk/ChangeLog
  cmus/trunk/PKGBUILD
Deleted:
  cmus/trunk/fix_format_print.patch

------------------------+
 ChangeLog              |    5 ++++
 PKGBUILD               |   26 ++++++++++---------------
 fix_format_print.patch |   48 -----------------------------------------------
 3 files changed, 16 insertions(+), 63 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-07-06 01:38:09 UTC (rev 84973)
+++ ChangeLog	2010-07-06 02:23:10 UTC (rev 84974)
@@ -1,3 +1,8 @@
+2010-07-05  Eric Belanger  <eric at archlinux.org>
+
+	* cmus 2.3.3-1
+	* Upstream update
+
 2010-05020  Ionut Biru <ibiru at archlinux.org>
 
 	* cmus 2.3.2-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-06 01:38:09 UTC (rev 84973)
+++ PKGBUILD	2010-07-06 02:23:10 UTC (rev 84974)
@@ -3,8 +3,8 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=cmus
-pkgver=2.3.2
-pkgrel=2
+pkgver=2.3.3
+pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/"
@@ -13,22 +13,18 @@
 depends=('sh' 'libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2')
 makedepends=('libmp4v2')
 optdepends=('libmp4v2')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2"
-	fix_format_print.patch)
-md5sums=('47698e355cff2e7b985a22475099c100'
-         '3d62fa9030cd054eb5fa0a275fd1964a')
+changelog=ChangeLog
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
+md5sums=('220e875e4210a6b54882114ef7094a79')
+sha1sums=('ca8c40c86ead8af05a1ca703caa4131217832114')
 
 build() {
-  cd $srcdir/$pkgname-v$pkgver
-
-  patch -Np1 -i $srcdir/fix_format_print.patch || return 1
-
-  export CONFIG_ARTS=n
-  ./configure prefix=/usr || return 1
-  make || return 1
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr CONFIG_ARTS=n
+  make
 }
 
 package() {
-  cd $srcdir/$pkgname-v$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
 }

Deleted: fix_format_print.patch
===================================================================
--- fix_format_print.patch	2010-07-06 01:38:09 UTC (rev 84973)
+++ fix_format_print.patch	2010-07-06 02:23:10 UTC (rev 84974)
@@ -1,48 +0,0 @@
-From 2e679c66554cc0205779a72b82ddcc0175f571a6 Mon Sep 17 00:00:00 2001
-From: Gregory Petrosyan <gregory.petrosyan at gmail.com>
-Date: Sun, 23 May 2010 20:02:58 +0400
-Subject: [PATCH] Fix format_print()'s buffer width calculation
-
-This solves reported memory corruptions and crashes.
-Looks like this bug was uncovered due to a GCC upgrade.
-
-Reported-by: Vlastimil Kotas <vlastikx at kralikbobek.cz>
-Reported-by: evinupavi662 at arcor.de
-Triaged-by: Xavier Chantry <chantry.xavier at gmail.com>
-Acked-by: Xavier Chantry <chantry.xavier at gmail.com>
-Signed-off-by: Gregory Petrosyan <gregory.petrosyan at gmail.com>
----
- ui_curses.c |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/ui_curses.c b/ui_curses.c
-index 0a390a0..ce6d334 100644
---- a/ui_curses.c
-+++ b/ui_curses.c
-@@ -104,7 +104,9 @@ static char print_buffer[512];
- /* destination buffer for utf8_encode and utf8_decode */
- static char conv_buffer[512];
- 
--#define print_buffer_size (sizeof(print_buffer) - 1)
-+/* one character can take up to 4 bytes in UTF-8 */
-+#define print_buffer_max_width (sizeof(print_buffer) / 4 - 1)
-+
- static int using_utf8;
- 
- static const char *t_ts;
-@@ -1181,10 +1183,10 @@ static void do_update_titleline(void)
- 
- 		/* set window title */
- 		if (use_alt_format) {
--			format_print(print_buffer, sizeof(print_buffer) - 1,
-+			format_print(print_buffer, print_buffer_max_width,
- 					window_title_alt_format, track_fopts);
- 		} else {
--			format_print(print_buffer, sizeof(print_buffer) - 1,
-+			format_print(print_buffer,  print_buffer_max_width,
- 					window_title_format, track_fopts);
- 		}
- 
--- 
-1.6.1
-