Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=348eeb1fade0efed10c625cd4ecb68700880d8aa

commit 348eeb1fade0efed10c625cd4ecb68700880d8aa
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Jun 19 19:47:31 2009 +0200

alsa-tools-1.0.20-2-i686
*rebuild with gtk+2-2.16.2-2
*added glibc patch

diff --git a/source/multimedia/alsa-tools/FrugalBuild 
b/source/multimedia/alsa-tools/FrugalBuild
index 8329391..ab274bd 100644
--- a/source/multimedia/alsa-tools/FrugalBuild
+++ b/source/multimedia/alsa-tools/FrugalBuild
@@ -3,17 +3,18 @@

pkgname=alsa-tools
pkgver=1.0.20
-pkgrel=1
+pkgrel=2
pkgdesc="Tools for ALSA."
url="http://www.alsa-project.org";
depends=('alsa-lib' 'libstdc++')
-makedepends=('qt' 'gtk+2' 'fltk')
+makedepends=('qt' 'gtk+2>=2.16.2-2' 'fltk')
groups=('multimedia')
archs=('i686' 'x86_64' 'ppc')
-source=(ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2 
alsa-tools-glibc-2.10.patch)
up2date="lynx -dump $url |grep -om1 'alsa-tools-\(.*\)tar.bz2'|sed 
's/.*tools-\(.*\).t.*/\1/'"
options=('scriptlet')
-sha1sums=('f066b2d8719536c29769db0f5274247f42036071')
+sha1sums=('f066b2d8719536c29769db0f5274247f42036071' \
+          '8f3a622bafb0d743a402bbaca1d562c690d3db5e')

subpkgs=('qlo10k1' "$pkgname-gui")
subdescs=('ALSA ld10k1 utility.' 'GUI based ALSA utilities.')
@@ -23,13 +24,15 @@ subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc')

build()
{
+       Fpatchall
Fcd
for i in ld10k1 `find . -type d`
do
[ "$CARCH" == "ppc" -a "$i" == "./sb16_csp" ] && continue
cd $i
if [ -x configure ]; then
-                       Fbuild
+                       Fmake
+                       Fmakeinstall
fi
cd -
done
diff --git a/source/multimedia/alsa-tools/alsa-tools-glibc-2.10.patch 
b/source/multimedia/alsa-tools/alsa-tools-glibc-2.10.patch
new file mode 100644
index 0000000..dc6068a
--- /dev/null
+++ b/source/multimedia/alsa-tools/alsa-tools-glibc-2.10.patch
@@ -0,0 +1,29 @@
+From b657bd3e5fb28a4a428e9acbb473cd3cba5b9f91 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= 
<flamee...@gmail.com>
+Date: Thu, 21 May 2009 12:17:02 +0200
+Subject: [PATCH 1/2] Don't redeclare isblank().
+
+While technically isblank() is a C library function, nothing stops it from
+being a macro, and indeed it seems to be on glibc-2.10.
+
+This should not be a problem because ctype.h already declares it on
+probably all the systems where it's used.
+---
+ envy24control/strstr_icase_blank.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/envy24control/strstr_icase_blank.c 
b/envy24control/strstr_icase_blank.c
+index af44854..4c325cf 100644
+--- a/envy24control/strstr_icase_blank.c
++++ b/envy24control/strstr_icase_blank.c
+@@ -48,7 +48,6 @@ int strstr_icase_blank(const char * const string1, const 
char * const string2)
+       char search_string[MAX_SEARCH_FIELD_LENGTH];
+       char *pstr;
+       int pos_first_non_blank;
+-      int isblank(int c);
+
+       strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH);
+       search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0';
+--
+1.6.3.1
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to