From ff9e4e102459123bc5bf56965828ebb81081d37f Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 23 Jul 2014 03:51:51 +0000 Subject: Wed Jul 23 03:42:18 UTC 2014 --- community/arm-none-eabi-gcc/PKGBUILD | 12 +-- community/haskell-terminfo/PKGBUILD | 42 ---------- .../haskell-terminfo/haskell-terminfo.install | 18 ----- community/haskell-xhtml/PKGBUILD | 51 ------------ community/haskell-xhtml/haskell-xhtml.install | 19 ----- community/httptunnel/PKGBUILD | 15 +++- .../httptunnel/httptunnel-3.3-build-fix.patch | 93 ++++++++++++++++++++++ community/lmms/PKGBUILD | 19 +++-- community/lmms/lmms-1.0.2-build-fix.patch | 86 ++++++++++++++++++++ community/lmms/lmms-1.0.3-build-fix.patch | 59 ++++++++++++++ community/nomacs/PKGBUILD | 9 +-- community/proxychains-ng/PKGBUILD | 6 +- community/qcad/PKGBUILD | 10 +-- community/xjadeo/PKGBUILD | 16 ++-- extra/apache/PKGBUILD | 6 +- extra/digikam/PKGBUILD | 6 +- extra/sonata/PKGBUILD | 13 +-- 17 files changed, 302 insertions(+), 178 deletions(-) delete mode 100644 community/haskell-terminfo/PKGBUILD delete mode 100644 community/haskell-terminfo/haskell-terminfo.install delete mode 100644 community/haskell-xhtml/PKGBUILD delete mode 100644 community/haskell-xhtml/haskell-xhtml.install create mode 100644 community/httptunnel/httptunnel-3.3-build-fix.patch create mode 100644 community/lmms/lmms-1.0.2-build-fix.patch create mode 100644 community/lmms/lmms-1.0.3-build-fix.patch diff --git a/community/arm-none-eabi-gcc/PKGBUILD b/community/arm-none-eabi-gcc/PKGBUILD index bd19b84f0..ebb25cad4 100644 --- a/community/arm-none-eabi-gcc/PKGBUILD +++ b/community/arm-none-eabi-gcc/PKGBUILD @@ -3,9 +3,9 @@ _target=arm-none-eabi pkgname=$_target-gcc -pkgver=4.9.0 -pkgrel=3 -_snapshot=4.9-20140604 +pkgver=4.9.1 +pkgrel=1 +#_snapshot=4.9-20140604 _newlibver=2.1.0 pkgdesc='The GNU Compiler Collection - cross compiler for ARM EABI (bare-metal) target' arch=(i686 x86_64) @@ -15,13 +15,13 @@ depends=($_target-binutils cloog libmpc zlib) makedepends=(gmp mpfr) #checkdepends=(dejagnu) options=(!emptydirs !strip staticlibs) -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.bz2 ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz gcc-multilib.patch gcc-no-exceptions.patch libgloss-configure-fix.patch) -sha256sums=('321f35fbe73023ca805824db90b0df49bfcbb5ee13c29c3cc3ea6ae8fb04b9da' +sha256sums=('d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e' '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48' '998d1face674cc8d1af5bf28ded15caaaa18936a28f278123448f29555a07775' '7f59b28475aa2018a7edfb81ea81444a6eb098fd3847d8e605809ae6fbeabde5' diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD deleted file mode 100644 index 6b93d18a0..000000000 --- a/community/haskell-terminfo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 110634 2014-05-04 13:55:13Z td123 $ -# Maintainer: Vesa Kaihlavirta -# Contributor: Arch Haskell Team - -_hkgname=terminfo -pkgname=haskell-terminfo -pkgver=0.4.0.0 -pkgrel=2 -pkgdesc="Haskell bindings to the terminfo library." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.8.2-2' 'sh') -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=${pkgname}.install -md5sums=('1995cacd80dd6ee3744c3a93f21081ae') - -build() { - cd "${srcdir}/${_hkgname}-${pkgver}" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "${srcdir}/${_hkgname}-${pkgver}" - - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community/haskell-terminfo/haskell-terminfo.install b/community/haskell-terminfo/haskell-terminfo.install deleted file mode 100644 index 40d39f42b..000000000 --- a/community/haskell-terminfo/haskell-terminfo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-terminfo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD deleted file mode 100644 index 5e09cee8e..000000000 --- a/community/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 110640 2014-05-04 13:55:19Z td123 $ -# Maintainer: Alexander Rødseth -# Contributor: Vesa Kaihlavirta -# Contributor: Arch Haskell Team - -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.1 -pkgrel=7 -pkgdesc='Combinators for producing XHTML 1.0' -url='http://hackage.haskell.org/package/xhtml' -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.8.2-2' 'sh') -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -install="$pkgname.install" -options=('staticlibs') -sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') - -build() { - cd "$_hkgname-$pkgver" - - runhaskell Setup configure -O -p \ - --enable-split-objs \ - --enable-shared \ - --prefix=/usr \ - --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$_hkgname-$pkgver" - - install -Dm744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/haskell-xhtml/haskell-xhtml.install b/community/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/community/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD index dad2e7b9a..59ae895df 100644 --- a/community/httptunnel/PKGBUILD +++ b/community/httptunnel/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 55529 2011-09-14 07:38:23Z andrea $ +# $Id: PKGBUILD 116094 2014-07-22 08:57:17Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: dorphell # Contributor: Tom Newsom pkgname=httptunnel pkgver=3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests" arch=('i686' 'x86_64') url="http://www.nocrew.org/software/httptunnel" license=('GPL2') depends=('glibc') -source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz") -md5sums=('493cc0f5f21e9955db27ee9cd9a976d5') +source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz" + 'httptunnel-3.3-build-fix.patch') +md5sums=('493cc0f5f21e9955db27ee9cd9a976d5' + '65c1f8a2a847fb4af106c9358f9e0be8') + +prepare() { + cd "${srcdir}"/$pkgname-$pkgver + patch -p0 -i ../httptunnel-3.3-build-fix.patch +} build() { cd "${srcdir}"/$pkgname-$pkgver diff --git a/community/httptunnel/httptunnel-3.3-build-fix.patch b/community/httptunnel/httptunnel-3.3-build-fix.patch new file mode 100644 index 000000000..184b7b401 --- /dev/null +++ b/community/httptunnel/httptunnel-3.3-build-fix.patch @@ -0,0 +1,93 @@ +--- configure.old 2001-02-25 13:07:03.000000000 +0100 ++++ configure 2014-07-22 10:49:32.449242277 +0200 +@@ -1573,45 +1573,12 @@ EOF + + fi + +-for ac_hdr in fcntl.h syslog.h unistd.h sys/poll.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1581: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < ++cat >> confdefs.h <&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-fi +-done + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +@@ -1729,39 +1696,6 @@ EOF + ;; + esac + +-echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:1734: checking for size_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-#if STDC_HEADERS +-#include +-#include +-#endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_size_t=yes +-else +- rm -rf conftest* +- ac_cv_type_size_t=no +-fi +-rm -f conftest* +- +-fi +-echo "$ac_t""$ac_cv_type_size_t" 1>&6 +-if test $ac_cv_type_size_t = no; then +- cat >> confdefs.h <<\EOF +-#define size_t unsigned +-EOF +- +-fi +- + ##AC_CHECK_TYPE(socklen_t, unsigned) # doesn't search + echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 + echo "configure:1768: checking for socklen_t" >&5 diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index d6b9c69a5..92e9b7674 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109323 2014-04-13 11:20:12Z lfleischer $ +# $Id: PKGBUILD 116113 2014-07-22 16:03:04Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Shinlun Hsieh # Contributor: Mateusz Herych # Contributor: Storyteller pkgname=lmms -pkgver=1.0.0 +pkgver=1.0.3 pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') @@ -23,18 +23,25 @@ provides=('lmms-extras') conflicts=('lmms-extras') options=('!makeflags') install=lmms.install -source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2/download" +source=("https://github.com/LMMS/${pkgname}/releases/download/v{$pkgver}/${pkgname}-${pkgver}-src.tar.bz2" + lmms-1.0.3-build-fix.patch zynaddsubfx_unlink.patch) -md5sums=('72260dd6e29bf018875fd751c1d43465' +md5sums=('1f63ad9abd1781206d852e79b2191638' + 'fa8ab5c48b021b87f80444440479190a' 'd2ea78ac0cf2979505f140c6845617cf') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../lmms-1.0.3-build-fix.patch + patch -Np1 -i ../zynaddsubfx_unlink.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake - patch -Np1 -i ../zynaddsubfx_unlink.patch - cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst make } diff --git a/community/lmms/lmms-1.0.2-build-fix.patch b/community/lmms/lmms-1.0.2-build-fix.patch new file mode 100644 index 000000000..7f003b54b --- /dev/null +++ b/community/lmms/lmms-1.0.2-build-fix.patch @@ -0,0 +1,86 @@ +From ab55b26e4b1521e5401f60a2f618f31579e9cc5c Mon Sep 17 00:00:00 2001 +From: Tobias Doerffel +Date: Sat, 5 Jul 2014 17:46:10 +0200 +Subject: [PATCH] SWH/BodeShifterCV: fix out-of-bounds array access + +The xcoeffs array only has 100 elements and thus accessing xcoeffs[100] +leads to undefined behaviour. +--- + plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +index 41fb4f0..967edf6 100644 +--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c ++++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +@@ -247,7 +247,7 @@ static void runBodeShifterCV(LADSPA_Handle instance, unsigned long sample_count) + /* Perform the Hilbert FIR convolution + * (probably FFT would be faster) */ + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + +-- +1.9.3 + +From f91925f34aa1ee8ecacb12b8c4943c7e8aaabbfe Mon Sep 17 00:00:00 2001 +From: Rafael Ruggiero +Date: Tue, 15 Jul 2014 17:41:07 -0300 +Subject: [PATCH] Update bode_shifter_cv_1432.c + +--- + plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +index 967edf6..a9c764e 100644 +--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c ++++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +@@ -350,7 +350,7 @@ static void runAddingBodeShifterCV(LADSPA_Handle instance, unsigned long sample_ + /* Perform the Hilbert FIR convolution + * (probably FFT would be faster) */ + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + +-- +1.9.3 + +From ad35c553b39fc70237605952bf2c6ff1fac5b7b7 Mon Sep 17 00:00:00 2001 +From: Rafael Ruggiero +Date: Tue, 15 Jul 2014 17:42:01 -0300 +Subject: [PATCH] Update surround_encoder_1401.c + +--- + plugins/LadspaEffect/swh/surround_encoder_1401.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/LadspaEffect/swh/surround_encoder_1401.c b/plugins/LadspaEffect/swh/surround_encoder_1401.c +index d4b6ace..100a03e 100644 +--- a/plugins/LadspaEffect/swh/surround_encoder_1401.c ++++ b/plugins/LadspaEffect/swh/surround_encoder_1401.c +@@ -228,7 +228,7 @@ static void runSurroundEncoder(LADSPA_Handle instance, unsigned long sample_coun + for (pos = 0; pos < sample_count; pos++) { + delay[dptr] = s[pos]; + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + dptr = (dptr + 1) & (D_SIZE - 1); +@@ -296,7 +296,7 @@ static void runAddingSurroundEncoder(LADSPA_Handle instance, unsigned long sampl + for (pos = 0; pos < sample_count; pos++) { + delay[dptr] = s[pos]; + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + dptr = (dptr + 1) & (D_SIZE - 1); +-- +1.9.3 + diff --git a/community/lmms/lmms-1.0.3-build-fix.patch b/community/lmms/lmms-1.0.3-build-fix.patch new file mode 100644 index 000000000..781b081a2 --- /dev/null +++ b/community/lmms/lmms-1.0.3-build-fix.patch @@ -0,0 +1,59 @@ +From f91925f34aa1ee8ecacb12b8c4943c7e8aaabbfe Mon Sep 17 00:00:00 2001 +From: Rafael Ruggiero +Date: Tue, 15 Jul 2014 17:41:07 -0300 +Subject: [PATCH] Update bode_shifter_cv_1432.c + +--- + plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +index 967edf6..a9c764e 100644 +--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c ++++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +@@ -350,7 +350,7 @@ static void runAddingBodeShifterCV(LADSPA_Handle instance, unsigned long sample_ + /* Perform the Hilbert FIR convolution + * (probably FFT would be faster) */ + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + +-- +1.9.3 + +From ad35c553b39fc70237605952bf2c6ff1fac5b7b7 Mon Sep 17 00:00:00 2001 +From: Rafael Ruggiero +Date: Tue, 15 Jul 2014 17:42:01 -0300 +Subject: [PATCH] Update surround_encoder_1401.c + +--- + plugins/LadspaEffect/swh/surround_encoder_1401.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/LadspaEffect/swh/surround_encoder_1401.c b/plugins/LadspaEffect/swh/surround_encoder_1401.c +index d4b6ace..100a03e 100644 +--- a/plugins/LadspaEffect/swh/surround_encoder_1401.c ++++ b/plugins/LadspaEffect/swh/surround_encoder_1401.c +@@ -228,7 +228,7 @@ static void runSurroundEncoder(LADSPA_Handle instance, unsigned long sample_coun + for (pos = 0; pos < sample_count; pos++) { + delay[dptr] = s[pos]; + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + dptr = (dptr + 1) & (D_SIZE - 1); +@@ -296,7 +296,7 @@ static void runAddingSurroundEncoder(LADSPA_Handle instance, unsigned long sampl + for (pos = 0; pos < sample_count; pos++) { + delay[dptr] = s[pos]; + hilb = 0.0f; +- for (i = 0; i <= NZEROS/2; i++) { ++ for (i = 0; i < NZEROS/2; i++) { + hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); + } + dptr = (dptr + 1) & (D_SIZE - 1); +-- +1.9.3 + diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index 10102ee81..70f3a82e5 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 106005 2014-02-21 02:39:30Z speps $ +# $Id: PKGBUILD 116077 2014-07-22 00:54:22Z speps $ # Maintainer: speps pkgname=nomacs -pkgver=1.6.4 +pkgver=2.0.0 pkgrel=1 pkgdesc="A Qt image viewer" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('qt4' 'exiv2' 'libraw' 'opencv') makedepends=('cmake') install="$pkgname.install" source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2") -md5sums=('c3d77583ff1926077eaa66c0dadec296') +md5sums=('9c666fa1bb1efe814fc70d1df810b9fd') prepare() { cd $pkgname-$pkgver @@ -21,8 +21,7 @@ prepare() { build() { cd $pkgname-$pkgver/b - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/proxychains-ng/PKGBUILD b/community/proxychains-ng/PKGBUILD index 4206181ff..78bb3c383 100644 --- a/community/proxychains-ng/PKGBUILD +++ b/community/proxychains-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107990 2014-03-20 13:45:41Z fyan $ +# $Id: PKGBUILD 116114 2014-07-22 16:03:20Z fyan $ # Maintainer: Felix Yan # Contributor: Cedric Girard pkgname=proxychains-ng -pkgver=4.7 +pkgver=4.8.1 pkgrel=1 pkgdesc="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ conflicts=('proxychains') depends=('glibc') backup=('etc/proxychains.conf') source=("http://downloads.sourceforge.net/project/$pkgname/proxychains-$pkgver.tar.bz2") -md5sums=('5c127db02feb45860feb887949955ecf') +md5sums=('70f732a63c1a1d6cff90efe71d28d1b1') build() { cd proxychains-$pkgver diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 24c9cf634..50db0697b 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 113782 2014-06-30 12:00:30Z spupykin $ +# $Id: PKGBUILD 116102 2014-07-22 13:25:23Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Stefan Husmann # Contributor: Giovanni Scafora # Contributor: Daniel J Griffiths pkgname=qcad -pkgver=3.6.0.0 +pkgver=3.6.2.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') @@ -16,14 +16,14 @@ makedepends=('glu') options=('libtool') source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('bee49bc3fe6fa00c2d80cc308edd2841' +md5sums=('498bc7e98b29889eedb7ecd72dc12010' '84f189dd152e7614a1265659dac6222d') prepare() { cd ${srcdir}/qcad-$pkgver sed -i '1,1i#include ' src/core/RThread.cpp - (cd src/3rdparty && cp -a qt-labs-qtscriptgenerator-4.8.5 qt-labs-qtscriptgenerator-4.8.6) - (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.6/ && mv qt-labs-qtscriptgenerator-4.8.5.pro qt-labs-qtscriptgenerator-4.8.6.pro) +# (cd src/3rdparty && cp -a qt-labs-qtscriptgenerator-4.8.5 qt-labs-qtscriptgenerator-4.8.6) +# (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.6/ && mv qt-labs-qtscriptgenerator-4.8.5.pro qt-labs-qtscriptgenerator-4.8.6.pro) } build() { diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD index 3665fc78e..249a58227 100644 --- a/community/xjadeo/PKGBUILD +++ b/community/xjadeo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 105623 2014-02-12 07:14:19Z schiv $ +# $Id: PKGBUILD 116110 2014-07-22 15:35:06Z speps $ # Maintainer : speps pkgname=xjadeo -pkgver=0.7.6 -pkgrel=2 +pkgver=0.7.8 +pkgrel=1 pkgdesc="A simple video player that is synchronized to jack transport." arch=('i686' 'x86_64') url="http://xjadeo.sourceforge.net" @@ -11,22 +11,24 @@ license=('GPL') depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo>=0.28' 'libxpm' 'libxv' 'portmidi') makedepends=('qt4') optdepends=('qt4: for the GUI (qjadeo)') +backup=('etc/xjadeorc') +install="$pkgname.install" source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" "qjadeo.desktop") -install="$pkgname.install" -md5sums=('9530c3b7b294e3abeb641640512984fc' +md5sums=('b93f9971436d0dda36867d16b15dc0dd' '315e2ab44ce3edf4068ff6db48942908') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ + --sysconfdir=/etc \ --enable-qtgui \ --with-qt4prefix=/usr/lib/qt4 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install # rc file diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 7c936f9d5..07bb6710c 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 208547 2014-03-24 13:25:02Z anatolik $ +# $Id: PKGBUILD 217733 2014-07-22 16:18:25Z anatolik $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache -pkgver=2.4.9 +pkgver=2.4.10 pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') @@ -35,7 +35,7 @@ source=( httpd.service arch.layout ) -sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603' +sha256sums=('176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a' 'SKIP' '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index fd8c49af2..18efe2571 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 213018 2014-05-17 10:20:46Z ronald $ +# $Id: PKGBUILD 217737 2014-07-22 19:45:28Z ronald $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=4.0.0 +pkgver=4.1.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('23fd1e31e1f0518265c3165e620beb15cef4d41e') +sha1sums=('b2cd7acca4e9b4d7924a5c5f76009846b8b3b6e0') prepare() { mkdir build diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD index 90702e0e3..081b6fc3b 100644 --- a/extra/sonata/PKGBUILD +++ b/extra/sonata/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 198683 2013-11-02 04:54:33Z bisson $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 217717 2014-07-22 07:38:22Z fyan $ +# Maintainer: Angel Velasquez +# Maintainer: Felix Yan # Contributor: William Rea pkgname=sonata pkgver=1.6.2.1 -pkgrel=11 +pkgrel=12 pkgdesc="Elegant GTK+ music client for MPD" arch=('i686' 'x86_64') -url="http://sonata.berlios.de/" +url="http://sourceforge.net/projects/sonata.berlios" license=('GPL3') depends=('pygtk' 'python2-mpd') optdepends=('python2-egg: Enhanced system tray support' 'python2-tagpy: Metadata editing support' 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') provides=('python2-mmkeys') -source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}.berlios/${pkgname}-$pkgver.tar.gz" mpd-0.18.patch info.py.patch) md5sums=('0b912325e7175abad3bf6c0edc071e05' @@ -30,5 +31,5 @@ build() { package() { cd ${pkgname}-$pkgver - python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" + python2 setup.py install --prefix=/usr --optimize=1 --root="$pkgdir" } -- cgit v1.2.3-54-g00ecf