diff --git a/common/shlibs b/common/shlibs index eb90c56ec8..59209baf51 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2126,7 +2126,7 @@ libCEGUICommonDialogs-0.so.2 cegui-0.8.7_1 libct.so.4 freetds-0.95.19_1 libsybdb.so.5 freetds-0.95.19_1 libqqwing.so.2 qqwing-1.3.4_1 -libiniparser.so.0 iniparser-4.0_1 +libiniparser.so.1 iniparser-4.1_1 libzita-resampler.so.1 zita-resampler-1.3.0_1 libmlt.so.6 mlt-6.4.1_1 libmlt++.so.3 mlt-6.4.1_1 diff --git a/srcpkgs/cava-gui/template b/srcpkgs/cava-gui/template index be17309f76..cf34bed3a8 100644 --- a/srcpkgs/cava-gui/template +++ b/srcpkgs/cava-gui/template @@ -1,7 +1,7 @@ # Template file for 'cava-gui' pkgname=cava-gui version=0.6.0 -revision=1 +revision=2 wrksrc="cava-${version}" build_style=gnu-configure hostmakedepends="automake libtool" diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template index ea4f8e194e..57e4eed324 100644 --- a/srcpkgs/cava/template +++ b/srcpkgs/cava/template @@ -1,7 +1,7 @@ # Template file for 'Cava' pkgname=cava version=0.6.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" makedepends="alsa-lib-devel pulseaudio-devel fftw-devel ncurses-devel iniparser-devel" diff --git a/srcpkgs/iniparser/patches/fix-malloc_size.patch b/srcpkgs/iniparser/patches/fix-malloc_size.patch deleted file mode 100644 index 9d4425b8be..0000000000 --- a/srcpkgs/iniparser/patches/fix-malloc_size.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/iniparser.c -+++ src/iniparser.c -@@ -66,7 +66,8 @@ static const char * strlwc(const char * in, char *out, unsigned len) - /*--------------------------------------------------------------------------*/ - static char * _strdup(const char *s) - { -- char * copy = (char*) malloc(strlen(s)); -+ char * copy = (char*) malloc(strlen(s) + 1); -+ if (copy) -- strcpy(copy, s); -+ strcpy(copy, s); - return copy ; - } --- -2.4.5 - diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template index db22049be5..326dc1521f 100644 --- a/srcpkgs/iniparser/template +++ b/srcpkgs/iniparser/template @@ -1,7 +1,7 @@ # Template file for 'iniparser' pkgname=iniparser -version=4.0 -revision=4 +version=4.1 +revision=1 build_style=gnu-makefile hostmakedepends="doxygen chrpath" short_desc="A free stand-alone ini file parsing library" @@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller " license="MIT" homepage="http://ndevilla.free.fr/iniparser/" distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=e0bbd664bb3f0d64c21ac2d67a843b1c7a3a9710e96393344d170ab8b33e92ba +checksum=960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae CFLAGS="-fPIC" @@ -32,7 +32,7 @@ do_install() { # Install libraries vmkdir usr/lib vcopy "libiniparser.*" usr/lib - ln -s libiniparser.so.0 ${DESTDIR}/usr/lib/libiniparser.so + ln -s libiniparser.so.1 ${DESTDIR}/usr/lib/libiniparser.so chrpath -d ${DESTDIR}/usr/lib/libiniparser.so # Install pkg-config file