Tue Apr 16 00:06:15 PDT 2013

12 files changed, 93 insertions, 65 deletions

diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index a538da976..7412d21da 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $
+# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-lib
-pkgver=1.0.26
+pkgver=1.0.27
 pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
@@ -24,4 +24,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('2dfa35d28471d721e592b616beedf965')
+md5sums=('f090c7dbd0fe57d786d82e411eac2d08')
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 5fd8b4e61..e63024bb2 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $
+# $Id: PKGBUILD 182805 2013-04-15 13:03:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.26
-pkgrel=1
+pkgver=1.0.27
+pkgrel=3
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -13,11 +13,17 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
-        alsa
-        alsa.conf.d
-        90alsa)
+        90alsa
+        alsa-restore-1.0.27.service.patch
+        alsactl-fix-buffer-overflow-1.0.27.patch)
 backup=(etc/conf.d/alsa)
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
+  patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-alsaconf \
@@ -29,14 +35,12 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa
-  install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa
   install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa
 
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('4dcf1017fafc91603af96705c073eca9'
-         '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '4c8ae9f976c7df5e271a4cb91ccc7767'
-         '529216f6a46e61a546640e08ea7a0879')
+md5sums=('cbfb21a24f63fb052b3392195639ce48'
+         '529216f6a46e61a546640e08ea7a0879'
+         '0a27f7b80351d6baa274c32d859bf037'
+         'cd577445636542f9f60b420e4ffe3f0f')
diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
new file mode 100644
index 000000000..b3a9d48fd
--- /dev/null
+++ b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
@@ -0,0 +1,10 @@
+--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old	2013-04-15 14:37:57.326541394 +0200
++++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in	2013-04-15 14:38:10.179673494 +0200
+@@ -12,6 +12,6 @@
+ Conflicts=shutdown.target
+ 
+ [Service]
+-Type=oneshop
++Type=oneshot
+ ExecStart=-@sbindir@/alsactl restore
+ StandardOutput=syslog
diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
new file mode 100644
index 000000000..d4b526614
--- /dev/null
+++ b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
@@ -0,0 +1,25 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
+Subject: alsactl: Fix the string size for the lock file contents
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
+
+alsactl: Fix the string size for the lock file contents
+
+The string length is 10 characters + LF + '\0' = 12 characters.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/alsactl/lock.c b/alsactl/lock.c
+index d34d013..fce208b 100644
+--- a/alsactl/lock.c
++++ b/alsactl/lock.c
+@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
+ 	int fd = -1, err = 0;
+ 	struct flock lck;
+ 	struct stat st;
+-	char lcktxt[11];
++	char lcktxt[12];
+ 	char *nfile;
+ 
+ 	if (!do_lock)
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index 259a37015..ead1f357c 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 181377 2013-04-04 01:09:57Z eric $
+# $Id: PKGBUILD 182782 2013-04-15 06:46:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
-pkgver=1.0.12
+pkgver=1.0.13
 _themever=1.0.1
 pkgrel=1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
@@ -10,11 +10,11 @@ arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
-         'libxdamage' 'libxrandr' 'libpulse' 'audiofile')
+         'libxrandr' 'libpulse')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
-sha1sums=('d0d9533f645cd5e72392517df2b50748eaa58411'
+sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9'
           'ae34e2df1294198795736bf953bf695aba93b710')
 
 build() {
diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD
index c66286d89..4e0ab9937 100644
--- a/extra/libcdio-paranoia/PKGBUILD
+++ b/extra/libcdio-paranoia/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio-paranoia
-pkgver=10.2+0.90
+pkgver=10.2+0.90+1
 pkgrel=1
 pkgdesc="CD paranoia libraries from libcdio"
 arch=('i686' 'x86_64')
@@ -11,27 +11,17 @@ license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcdio')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        header-fix.patch)
-md5sums=('432e9f1c5ceb645c4bca9db3f9297437'
-         '39766404d473ecda66c2f3a932d1c57c'
-         '1ebb33a1cfe00181de31138ef001e01b')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('e79e196864dd3b1ca87a01345abbda07'
+         'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i ../header-fix.patch
-  sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-  aclocal
-  autoconf
-  automake --add-missing
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make -j1 DESTDIR="${pkgdir}" install
-  
-  #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-  #  $pkgdir/usr/include/cdio/cdio_config.h
 }
diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch
deleted file mode 100644
index 15cf0e0e2..000000000
--- a/extra/libcdio-paranoia/header-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/cdio/paranoia/Makefile.am.orig	2013-01-08 10:40:32.237218755 +0000
-+++ include/cdio/paranoia/Makefile.am	2013-01-08 10:41:22.269997804 +0000
-@@ -3,8 +3,8 @@
- ########################################################
- #
- 
--libcdioincludedir=$(includedir)/cdio
--dist_libcdioinclude_HEADERS = cdda.h paranoia.h 
-+cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
- 
- EXTRA_DIST = version.h.in
- BUILT_SOURCES = version.h
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 004ccdaf0..36a144f1b 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171967 2012-11-25 14:53:14Z andrea $
+# $Id: PKGBUILD 182786 2013-04-15 10:09:42Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmygpo-qt
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="A C++/Qt client library for gpodder.net"
 arch=('i686' 'x86_64')
 url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -12,7 +12,7 @@ license=('LGPL2.1')
 depends=('qjson')
 makedepends=('cmake' 'doxygen')
 source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz")
-md5sums=('dd07ccc88eac954a3860aeda96aab7b1')
+md5sums=('447e60c8c695b4280a0e20c71abacf49')
 
 build() {
   mkdir build
diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD
index 3fa1d4ae2..e0102c451 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175939 2013-01-25 05:33:39Z eric $
+# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $
 # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
 # Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=perl-yaml-syck
 _realname=YAML-Syck
-pkgver=1.22
+pkgver=1.25
 pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
-md5sums=('361db9a4dcaf8fa279ca813e146ce7d7')
+md5sums=('847f315cbd074b42c44f360383ac13e9')
 
 build() {
   cd "${srcdir}/${_realname}-$pkgver"
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index c27973c7a..5ee861f74 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 
 pkgname=pyalpm
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Libalpm bindings for Python 3"
 arch=('i686' 'x86_64')
@@ -9,10 +9,14 @@ url="http://projects.archlinux.org/users/remy/pyalpm.git/"
 license=('GPL')
 depends=('python>=3.2' 'pacman>=4.1')
 source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('614fa9f8a5c7cef0828b4f6306ef92f2')
+md5sums=('7310508a3b009705b77dd1d93b3012d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # workaround Python packaging issue (FS#34658)
+  export CFLAGS="$CFLAGS -Wno-format"
+
   python setup.py build
 }
 
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index d9e9562c8..ccecfea41 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175524 2013-01-18 19:34:24Z andyrtr $
+# $Id: PKGBUILD 182840 2013-04-15 16:29:09Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Miguel Revilla <yo at miguelrevilla.com>
 # Contributor: David Sotelo <dvsotelo at gmail.com>
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=qpdf
-pkgver=4.0.1
+pkgver=4.1.0
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('pcre' 'perl')
 makedepends=('make')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('093baece867a0a7e07774bd4008156b3')
+md5sums=('eedd61acc53744446d181429651a9baf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index bf89afacc..219a4fff2 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178993 2013-03-01 10:25:02Z andrea $
+# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=13.02
+pkgver=13.04
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64')
@@ -23,14 +23,22 @@ optdepends=('lilypond: notation display'
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('c1e2f80b599a942896e9ebd63896032f')
+md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # lrdf + raptor2 compatibility
-  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
-  LRELEASE=/usr/lib/qt4/bin/lrelease LUPDATE=/usr/lib/qt4/bin/lupdate ./configure --prefix=/usr
+  lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
+
+  # qt4 compatibility (qt->qt5)
+  LRELEASE=/usr/lib/qt4/bin/lrelease
+  LUPDATE=/usr/lib/qt4/bin/lupdate
+
+  export lrdf_CFLAGS LRELEASE LUPDATE
+
+  ./configure --prefix=/usr
+
   make
 }