Sun Mar 25 00:02:31 UTC 2012

9 files changed, 120 insertions, 54 deletions

diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD
index 7b04adec0..a38a266bd 100644
--- a/community/9base/PKGBUILD
+++ b/community/9base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65679 2012-02-21 21:15:24Z cbrannon $
+# $Id: PKGBUILD 68390 2012-03-23 21:00:56Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=9base
 pkgver=6
-pkgrel=3
+pkgrel=4
 pkgdesc="Port of various original Plan9 tools to unix"
 url="http://tools.suckless.org/9base"
 source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh)
@@ -26,6 +26,7 @@ build()
 	esac
 
   sed -i 's#^PREFIX\s.*$#PREFIX = /opt/plan9#' config.mk
+  sed -i 's#^CFLAGS\s*+=#CFLAGS += -DPLAN9PORT #' config.mk
 
   # Force dynamic linking.  Several of the programs in 9base won't work
   # when statically linked against the latest glibc.
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 152a80649..66537479d 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 67553 2012-03-13 12:19:58Z seblu $
+# $Id: PKGBUILD 68371 2012-03-23 10:07:50Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.14
-pkgrel=2
+pkgver=2.0.15
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,12 +15,12 @@ depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
         'acpid'
         'anything'
         'handler.sh'
         'acpid.conf.d')
-md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
+md5sums=('1b1c8775adab6a994a386c45af6b86dc'
          'd69203a032c4583f9abaafcf21a7ed84'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          '615439f4a89716c747907d4fc3c8df75'
@@ -28,19 +28,20 @@ md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
 
 build() {
   cd $pkgname-$pkgver
+  ./configure --prefix=/usr
   make
 }
 
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid"
   install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything"
   install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh"
   install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid"
 
-  chmod 755 "${pkgdir}"/usr/sbin/acpid
+  chmod 755 "$pkgdir"/usr/sbin/acpid
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index b4c2d8a56..91d738d59 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67260 2012-03-05 23:04:32Z mtorromeo $
+# $Id: PKGBUILD 68379 2012-03-23 14:35:57Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
@@ -30,7 +30,7 @@ source=(
 	auditd.rc
 	python2.patch
 )
-md5sums=('b60366dbe0c3a7497bdd8b3f7065b266'
+md5sums=('dc099fcb2f9242d47ecc35b46d71dfd1'
          '5f86e87354d0c3b9b408a26daed7a906'
          '45a33c6bef84f8e1701cb0b5e187336b')
 
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 8bab0f4d1..18ca7041a 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 68377 2012-03-23 13:38:01Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
-pkgver=1.3.6
+pkgver=1.3.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
@@ -14,62 +14,64 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.conf'
         'bird.service'
         'bird6.service')
-md5sums=('fa5621a41dcd86b6cb8cbe4fbd74af7e'
+md5sums=('c400b008ef834d9e7288dcdbe41b7c15'
          '1a4b98756d64f52333a83eff2e95d233'
          '25241a4d7ef639506e0080431b2c1690'
          'e82a0519dca0b289685fda44787f5911'
          'c32e7f6cf1be6ed6f9aa98feea25176d')
 
 build() {
-  # different directory to build seprate version of bird
-  cp -a ${pkgbase}-${pkgver} ${pkgbase}6-${pkgver}
+  cd $pkgbase-$pkgver
+  [[ -e _build4 ]] && rm -rf _build4
+  [[ -e _build6 ]] && rm -rf _build6
+  mkdir _build4 _build6
 
-  # build classic bird
-  cd ${pkgbase}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var
+  # build ipv4 bird
+  cd _build4
+  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var
   make
 
   # build ipv6 bird
-  cd "$srcdir/${pkgbase}6-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var --enable-ipv6
+  cd ../_build6
+  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var --enable-ipv6
   make
 }
 
 package_bird () {
-  pkgdesc='RIP, OSPFv2 and BGP daemon'
+  pkgdesc='RIP, OSPFv2 and BGP daemon (ipv4 version)'
   backup=('etc/bird.conf')
 
-  # iniscripts files
-  install -D -m 755 bird.rc "${pkgdir}/etc/rc.d/bird"
-  install -D -m 644 bird.conf "${pkgdir}/etc/conf.d/bird"
-  # systemd file
-  install -D -m 644 bird.service "${pkgdir}/lib/systemd/system/bird.service"
-
-  cd ${pkgname}-${pkgver}
-  make prefix="${pkgdir}/usr" sysconfdir="${pkgdir}/etc" localstatedir="${pkgdir}/var" install
-  make docdir="${pkgdir}/usr/share/doc/${pkgname}" install-docs
+  cd $pkgbase-$pkgver/_build4
+  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
+  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"
+
+  # iniscripts files
+  install -D -m 755 "$srcdir/bird.rc" "$pkgdir/etc/rc.d/bird"
+  install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird"
+  # systemd file
+  install -D -m 644 "$srcdir/bird.service" "$pkgdir/lib/systemd/system/bird.service"
 }
 
 package_bird6 () {
   pkgdesc='RIP, OSPFv3, RADV and BGP daemon (ipv6 version)'
   backup=('etc/bird6.conf')
 
-  # iniscripts files
-  install -D -m 755 bird.rc "${pkgdir}/etc/rc.d/bird6"
-  install -D -m 644 bird.conf "${pkgdir}/etc/conf.d/bird6"
-  sed -ri 's/bird/bird6/' "${pkgdir}/etc/rc.d/bird6"
-  # systemd config file
-  install -D -m 644 bird6.service "${pkgdir}/lib/systemd/system/bird6.service"
-
-  cd ${pkgname}-${pkgver}
-  make prefix="${pkgdir}/usr" sysconfdir="${pkgdir}/etc" localstatedir="${pkgdir}/var" install
-  make docdir="${pkgdir}/usr/share/doc/${pkgname}" install-docs
+  cd $pkgbase-$pkgver/_build6
+  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
+  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"
+
+  # iniscripts files
+  install -D -m 755 "$srcdir/bird.rc" "$pkgdir/etc/rc.d/bird6"
+  install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird6"
+  sed -i 's/bird/bird6/' "$pkgdir/etc/rc.d/bird6"
+  # systemd config file
+  install -D -m 644 "$srcdir/bird6.service" "$pkgdir/lib/systemd/system/bird6.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 77c6a45bb..c09c8a4ab 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68275 2012-03-21 07:34:10Z giovanni $
+# $Id: PKGBUILD 68373 2012-03-23 10:53:05Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.43
-pkgrel=3
+pkgver=0.8.44
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -21,7 +21,7 @@ install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('9c9656b0881ef8013018ec4cf42b3119'
+md5sums=('7cb3983a0458d20df982300b310df3be'
          'c7eaa8ed3d2b0a09345aecffa1402ff4'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD
index 8714306f7..d4d65ff95 100644
--- a/community/compizconfig-python/PKGBUILD
+++ b/community/compizconfig-python/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 68304 2012-03-21 10:37:36Z pschmitz $
+# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=compizconfig-python
 pkgver=0.8.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Compizconfig bindings for python"
 arch=('i686' 'x86_64')
 url="http://opencompositing.org"
 license=('GPL')
-depends=('compiz-core>=0.8.4' 'libcompizconfig>=0.8.4' 'glib2' 'python2')
+depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr')
 makedepends=('intltool' 'pkgconfig' 'pyrex')
 conflicts=('compizconfig-python-git')
 source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 8af1eefc4..14695c1ab 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67907 2012-03-16 00:38:17Z tdziedzic $
+# $Id: PKGBUILD 68386 2012-03-23 19:11:14Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -7,7 +7,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.13
+pkgver=0.6.14
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('87078586e226fd7a4db60d38bea9aad6')
+md5sums=('3033a866e230cca64e212ee8f2af27dd')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/widelands/6233_6232.diff b/community/widelands/6233_6232.diff
new file mode 100644
index 000000000..f82477607
--- /dev/null
+++ b/community/widelands/6233_6232.diff
@@ -0,0 +1,59 @@
+=== modified file 'src/graphic/graphic.cc'
+--- src/graphic/graphic.cc	2011-11-30 21:38:37 +0000
++++ src/graphic/graphic.cc	2012-02-19 17:10:12 +0000
+@@ -725,6 +725,18 @@
+ 	if (!png_ptr)
+ 		throw wexception("Graphic::save_png: could not create png struct");
+ 
++	png_infop info_ptr = png_create_info_struct(png_ptr);
++	if (!info_ptr) {
++		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
++		throw wexception("Graphic::save_png: could not create png info struct");
++	}
++
++	// Set jump for error
++	if (setjmp(png_jmpbuf(png_ptr))) {
++		png_destroy_write_struct(&png_ptr, &info_ptr);
++		throw wexception("Graphic::save_png: Error writing PNG!");
++	}
++
+ 	//  Set another write function. This is potentially dangerouse because the
+ 	//  flush function is internally called by png_write_end(), this will crash
+ 	//  on newer libpngs. See here:
+@@ -736,35 +748,14 @@
+ 		 sw,
+ 		 &Graphic::m_png_write_function, &Graphic::m_png_flush_function);
+ 
+-	png_infop info_ptr = png_create_info_struct(png_ptr);
+-
+-	if (!info_ptr) {
+-		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
+-		throw wexception("Graphic::save_png: could not create png info struct");
+-	}
+-
+-	// Set jump for error
+-	if (setjmp(png_jmpbuf(png_ptr))) {
+-		png_destroy_write_struct(&png_ptr, &info_ptr);
+-		throw wexception("Graphic::save_png: could not set png setjmp");
+-	}
+-
+ 	// Fill info struct
+ 	png_set_IHDR
+ 		(png_ptr, info_ptr, pix.get_w(), pix.get_h(),
+ 		 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+ 		 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ 
+-	// png_set_strip_16(png_ptr) ;
+-
+ 	// Start writing
+ 	png_write_info(png_ptr, info_ptr);
+-
+-	// Strip data down
+-	png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+-
+-	png_set_packing(png_ptr);
+-
+ 	{
+ 		uint32_t surf_w = pix.get_w();
+ 		uint32_t surf_h = pix.get_h();
+
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 6f540efaa..80885f298 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63777 2012-02-05 12:14:08Z ibiru $
+# $Id: PKGBUILD 68367 2012-03-23 06:59:41Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,7 +6,7 @@
 pkgname=widelands
 pkgver=16
 _realver=build16
-pkgrel=5
+pkgrel=6
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64')
 url="http://widelands.org/"
@@ -14,11 +14,13 @@ license=('GPL')
 makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
 source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
         widelands-0.16-libpng15.patch
+        6233_6232.diff
         $pkgname.desktop
         $pkgname.png
         $pkgname.sh)
 md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
          'e492620b071cbd1db04280173653a67c'
+         '9f91bff91a6867cc3ecdea407007d781'
          '15820bf099fd6f16251fe70a75c534bb'
          '3dfda7e9ca76ca00dd98d745d0ceb328'
          '7cae50aba5ed0cd2cfeea79124637b46')
@@ -27,6 +29,7 @@ build() {
     cd $srcdir/$pkgname-$_realver-src
 
     patch -Np0 < $srcdir/widelands-0.16-libpng15.patch
+    patch -Np0 < $srcdir/6233_6232.diff
 
     mkdir -p build/compile && cd build/compile