[arch-commits] Commit in wmix/repos (3 files)

[Allan McRae]

    Date: Friday, July 10, 2009 @ 00:19:31
  Author: allan
Revision: 45361

Merged revisions 45360 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/wmix/trunk

........
  r45360 | allan | 2009-07-10 14:18:34 +1000 (Fri, 10 Jul 2009) | 2 lines
  
  upgpkg: wmix 3.1-4
      fix crash (FS#15422), use our CFLAGS
........

Added:
  wmix/repos/extra-i686/wmix-fix-free.patch
    (from rev 45360, wmix/trunk/wmix-fix-free.patch)
Modified:
  wmix/repos/extra-i686/	(properties)
  wmix/repos/extra-i686/PKGBUILD

---------------------+
 PKGBUILD            |   16 +++++++++++-----
 wmix-fix-free.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)


Property changes on: wmix/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /wmix/trunk:1-30601
   + /wmix/trunk:1-45360

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-10 04:18:34 UTC (rev 45360)
+++ extra-i686/PKGBUILD	2009-07-10 04:19:31 UTC (rev 45361)
@@ -4,20 +4,26 @@
 
 pkgname=wmix
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Dockapp mixer for OSS or ALSA"
 arch=('i686' 'x86_64')
 url="http://www.ne.jp/asahi/linux/timecop/"
 license=('GPL')
 depends=('libxpm')
-source=(http://www.ne.jp/asahi/linux/timecop/software/$pkgname-$pkgver.tar.gz)
-md5sums=('62f6e86f7558f193e081dc29444a6699')
+source=(http://www.ne.jp/asahi/linux/timecop/software/$pkgname-$pkgver.tar.gz
+        wmix-fix-free.patch)
+md5sums=('62f6e86f7558f193e081dc29444a6699'
+         '07b9b42c87cbe9531c6de5eb2e8596b0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  install -d $pkgdir/usr/bin
-  #  Fix version.
+  install -dm755 $pkgdir/usr/bin
+  # Fix version.
   sed -e '/^#define VERSION/ s/3\.0/3.1/' -e 's/wmix 3\.0/wmix 3.1/' -i wmix.c || return 1
+  # Use our cflags
+  sed -i "s/-O3/$CFLAGS/" Makefile
+  # Fix crash (FS#15422)
+  patch -Np0 -i $srcdir/wmix-fix-free.patch
   make || return 1
   make PREFIX=$pkgdir/usr install || return 1
   install -D -m644 wmix.1x.gz $pkgdir/usr/share/man/man1/wmix.1x.gz || return 1

Copied: wmix/repos/extra-i686/wmix-fix-free.patch (from rev 45360, wmix/trunk/wmix-fix-free.patch)
===================================================================
--- extra-i686/wmix-fix-free.patch	                        (rev 0)
+++ extra-i686/wmix-fix-free.patch	2009-07-10 04:19:31 UTC (rev 45361)
@@ -0,0 +1,11 @@
+--- wmix.c.orig	2004-05-12 21:30:53.000000000 -0300
++++ wmix.c	2009-07-08 00:20:28.000000000 -0300
+@@ -134,7 +134,7 @@
+     }
+ 
+     /* handle writing PID file, silently ignore if we can't do it */
+-    pid = calloc(1, strlen(home) + 10);
++    pid = calloc(1, strlen(home) + 11);
+     sprintf(pid, "%s/.wmix.pid", home);
+     fp = fopen(pid, "w");
+     if (fp) {