Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e42576f305919c121dd3d12f87c5fab225ba51f

commit 3e42576f305919c121dd3d12f87c5fab225ba51f
Author: exceed <exceed.ced...@gmail.com>
Date:   Thu Apr 8 23:24:54 2010 +0200

zynaddsubfx-2.4.0-2-i686

* Fixed bank select bug with zlib.patch

diff --git a/source/xmultimedia-extra/zynaddsubfx/FrugalBuild 
b/source/xmultimedia-extra/zynaddsubfx/FrugalBuild
index 298ecd3..c7f9964 100644
--- a/source/xmultimedia-extra/zynaddsubfx/FrugalBuild
+++ b/source/xmultimedia-extra/zynaddsubfx/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=zynaddsubfx
pkgver=2.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="A powerful realtime, multi-timbral software synthesizer for Linux"
depends=('fftw' 'mxml' 'fltk' 'zlib' 'alsa-oss' 'jack' 'libxext' 'libstdc++' 
'fontconfig' 'libxrender')
groups=('xmultimedia-extra')
@@ -13,9 +13,10 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
_F_cd_path="$_F_sourceforge_name-$pkgver/src"
unset MAKEFLAGS
-source=(${sour...@]} jack_and_oss.patch)
+source=(${sour...@]} jack_and_oss.patch zlib.patch)
sha1sums=('e253e99399590ef2ff7f276f720dc367e2864f10' \
-          'ad5197eafc645784a9ca8f9e3fc87375c02c8c0b')
+          'ad5197eafc645784a9ca8f9e3fc87375c02c8c0b' \
+          'f402b06d2ea5668521422d5f00f7c6fd27ca4ce4')

_F_desktop_name="$_F_sourceforge_name"
_F_desktop_icon="/usr/share/${pkgname}/zynaddsubfx_icon.ico"
diff --git a/source/xmultimedia-extra/zynaddsubfx/zlib.patch 
b/source/xmultimedia-extra/zynaddsubfx/zlib.patch
new file mode 100644
index 0000000..5ab0cad
--- /dev/null
+++ b/source/xmultimedia-extra/zynaddsubfx/zlib.patch
@@ -0,0 +1,23 @@
+--- src/Misc/XMLwrapper.cpp    2010-02-10 18:36:01.000000000 -0500
++++ src/Misc/XMLwrapper.cpp    2010-02-10 19:51:09.000000000 -0500
+@@ -307,14 +307,16 @@ char *XMLwrapper::doloadfile(const strin
+     int filesize=-1;
+
+     //try get filesize as gzip data (first)
++    char buf[1024*512];
+     gzFile gzfile=gzopen(filename.c_str(),"rb");
+     if (gzfile!=NULL) {//this is a gzip file
+         // first check it's size
+         while (!gzeof(gzfile)) {
+-            gzseek (gzfile,1024*1024,SEEK_CUR);
+-            if (gztell(gzfile)>10000000) {
++            //--- Replaced gzseek by gzread to circumvent a problem introduced
++            //--- in the devel version of zlib (1.2.3.7)
++            if (gzread(gzfile, buf, 1024*512) == 0) {
+                 gzclose(gzfile);
+-                goto notgzip;//the file is too big
++                goto notgzip; // failed to read from the file
+             };
+         };
+         filesize=gztell(gzfile);
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to