Wed Dec 21 23:14:54 UTC 2011

16 files changed, 166 insertions, 90 deletions

diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index ae17ecb75..920c6437a 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $
+# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.96
-pkgrel=1
+pkgrel=3
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -24,12 +24,13 @@ replaces=('bluez-libs' 'bluez-utils')
 options=('!libtool' 'emptydirs')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+#source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
         'rc.bluetooth')
 md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
-         '8f60a5eb9d84b9c64c478d63e1c24b10'
-         'ca4c39eb4bb201bd2eacad01492cd735')
+         '7412982b440f29fa7f76a41a87fef985'
+         '8f9498707f809506928b2e480d3b6789')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -49,8 +50,7 @@ build() {
     --enable-pand \
     --enable-dund \
     --enable-cups \
-    --enable-udevrules \
-    --enable-configfiles
+    --enable-wiimote
   make
 }
 
@@ -70,9 +70,14 @@ package() {
   install -Dm644 ${srcdir}/bluetooth.conf.d \
     ${pkgdir}/etc/conf.d/bluetooth
 
-  install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
+  # FS#27630
+  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
+  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
+  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
   sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    ${pkgdir}/usr/bin/bluez-simple-agent
+    "${pkgdir}"/usr/bin/bluez-simple-agent \
+    "${pkgdir}"/usr/bin/bluez-test-device \
+    "${pkgdir}"/usr/bin/bluez-test-input
 
   # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
   rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules
diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d
index 6648740eb..1c1e02589 100644
--- a/extra/bluez/bluetooth.conf.d
+++ b/extra/bluez/bluetooth.conf.d
@@ -25,6 +25,6 @@
 #RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
 
 # Options for hidd, dund and pand (default: none)
-#HIDD_OPTIONS=""
+HIDD_OPTIONS="--server"
 #DUND_OPTIONS=""
 #PAND_OPTIONS=""
diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth
index 096242011..a46ee2abb 100644
--- a/extra/bluez/rc.bluetooth
+++ b/extra/bluez/rc.bluetooth
@@ -46,7 +46,7 @@ case "$1" in
     fi
     if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
       stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS --server
+      $HIDD_EXEC $HIDD_OPTIONS
     fi
     if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
       stat_append " $RFCOMM_NAME"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index f97ac0662..f079c7170 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144950 2011-12-11 21:22:27Z ibiru $
+# $Id: PKGBUILD 145269 2011-12-20 21:38:03Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,18 +14,12 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini
-        filechooserdefault_do_not_unref_value_twice.patch
-        moveresize.patch)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6'
-            '627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7')
+        settings.ini)
+sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
-    patch -Np1 -i "$srcdir/moveresize.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 42b709b7e..0da149312 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144303 2011-12-04 16:54:45Z schiv $
+# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -20,6 +20,7 @@ options=('!libtool')
 provides=("$_longname=$pkgver")
 conflicts=("$_longname")
 replaces=("$_longname")
+install=$pkgname.install
 source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
diff --git a/extra/jack/jack.install b/extra/jack/jack.install
new file mode 100644
index 000000000..8be532f6d
--- /dev/null
+++ b/extra/jack/jack.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	rm -f etc/security/limits.d/99-realtime.conf
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/kmod/PKGBUILD b/extra/kmod/PKGBUILD
new file mode 100644
index 000000000..3b17c9f26
--- /dev/null
+++ b/extra/kmod/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 145285 2011-12-21 02:42:53Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=kmod
+pkgver=2
+pkgrel=2
+pkgdesc="A set of tools to handle common tasks with Linux kernel modules"
+arch=('i686' 'x86_64')
+url="http://git.profusion.mobi/cgit.cgi/kmod.git"
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz")
+md5sums=('6017364434377f6724f749d7a28c5d7a')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --enable-zlib
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh et
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 96e9e69b5..51aa6df6f 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129225 2011-06-26 02:06:08Z allan $
+# $Id: PKGBUILD 145273 2011-12-21 01:12:32Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -19,16 +19,22 @@ source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.
 md5sums=('03b9c1406c7bfdc204313c2917ce6962')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
   make
 }
 
+check() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  make test
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR=$pkgdir/ install
   
   # provide jpegint.h as it is required by various software
   install -m644 jpegint.h $pkgdir/usr/include/
@@ -38,5 +44,5 @@ package() {
   rm $pkgdir/usr/include/turbojpeg.h
   rm $pkgdir/usr/bin/jpgtest
   
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE"
+  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE
 }
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index 1af7a2b70..6031eb6ff 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $
+# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
 
 pkgname=liboauth
-pkgver=0.9.4
-pkgrel=2
+pkgver=0.9.6
+pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
 arch=('i686' 'x86_64')
 url='http://liboauth.sourceforge.net'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('curl')
 options=('!libtool')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
-sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549')
+sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index b869cdf3b..e2099cc99 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $
+# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
-pkgver=4.5.1
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
-url="http://phonon.kde.org"
+url='http://phonon.kde.org/'
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-       'libqzeitgeist08.patch')
-md5sums=('3df071b7f9996afcd67b18958955ecdd'
-         '99de3dc908277199b502e54613925ff6')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch
-
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
+    -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+    -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
   make
 }
 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7023d412d..257798d85 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $
+# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=1.1.12
-pkgrel=5
+pkgver=1.1.13
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -39,18 +39,14 @@ backup=('usr/share/vlc/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'bp-set-channel-map-pulseaudio-1.0.patch')
-md5sums=('91de1ad308c947e35380f9d747ff5713'
-         'bae24e02207364d76a1a118644de484e')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
-  patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
diff --git a/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD
index dabc0db1c..1cc6f85b1 100644
--- a/extra/xdelta/PKGBUILD
+++ b/extra/xdelta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91165 2010-09-23 14:13:09Z allan $
+# $Id: PKGBUILD 145275 2011-12-21 01:19:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xdelta
 pkgver=1.1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="binary file delta generator"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/xdelta/"
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD
index a8149d55c..05cabed7d 100644
--- a/extra/xdelta3/PKGBUILD
+++ b/extra/xdelta3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: $
+# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 # Contributor: Henning Garus <henning.garus@gmail.com>
 
 pkgname=xdelta3
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A diff utility which works with binary files"
 arch=('i686' 'x86_64')
 url="http://xdelta.org/"
@@ -15,15 +15,25 @@ optdepends=('python2: for python modules')
 source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
         xdelta3-makefile.patch)
 md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
-         '378e9a735d92fb2fc695ed9ce2fad2d5')
+         'fa5973870faf7523043c4858ab7c3bdb')
 
 build() {
   cd $srcdir/xdelta$pkgver
+
   patch -Np1 -i $srcdir/xdelta3-makefile.patch
   sed -i "/PYVER = /s/2.6/2.7/" Makefile
   
   make xdelta3
   make xdelta3module.so
+  
+  # for testsuite
+  make xdelta3-debug
+}
+
+check() {
+  cd $srcdir/xdelta$pkgver
+
+  make test
 }
 
 package() {
diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch
index 3085d3c29..d5fa12e70 100644
--- a/extra/xdelta3/xdelta3-makefile.patch
+++ b/extra/xdelta3/xdelta3-makefile.patch
@@ -1,7 +1,34 @@
-diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
---- xdelta3.0v-old/Makefile	2009-03-12 01:44:51.000000000 +0000
-+++ xdelta3.0v/Makefile	2009-03-14 17:02:33.000000000 +0000
-@@ -200,6 +200,9 @@
+diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile
+--- xdelta3.0.0-orig/Makefile	2011-01-09 18:29:06.000000000 +1000
++++ xdelta3.0.0/Makefile	2011-12-21 11:53:13.530028738 +1000
+@@ -54,7 +54,7 @@
+ WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
+ 
+ # -arch x86_64
+-CFLAGS= -Wall -Wshadow -fno-builtin
++CFLAGS+= -Wall -Wshadow -fno-builtin
+ WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
+ 
+ # $Format: "REL=$Xdelta3Version$" $
+@@ -126,7 +126,7 @@
+ 	$(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
+ 
+ xdelta3: $(SOURCES)
+-	$(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
++	$(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \
+ 	      -DGENERIC_ENCODE_TABLES=0 \
+ 	      -DREGRESSION_TEST=1 \
+ 	      -DSECONDARY_DJW=1 \
+@@ -137,7 +137,7 @@
+ 	      -DXD3_USE_LARGEFILE64=1
+ 
+ xdelta3-debug: $(SOURCES)
+-	$(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
++	$(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \
+ 		-DGENERIC_ENCODE_TABLES=1 \
+ 		-DREGRESSION_TEST=1 \
+ 		-DSECONDARY_DJW=1 \
+@@ -202,6 +202,9 @@
  xdelta3.o: $(SOURCES)
  	$(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
  
@@ -11,14 +38,14 @@ diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
  xdelta3_wrap.o: xdelta3_wrap.c
  	$(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
  	      -DHAVE_CONFIG_H \
-@@ -218,8 +221,8 @@
+@@ -221,8 +224,8 @@
  	cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
  
  ifeq ("$(DARWIN)", "")
 -xdelta3module.so: xdelta3_wrap.o xdelta3.o
 -	ld -shared xdelta3.o xdelta3_wrap.o \
 +xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
-+	cc -shared xdelta3_PIC.o xdelta3_wrap.o \
++	cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
  		-o xdelta3module.so \
  		/usr/lib/libpython$(PYVER).so \
  		-lc
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 4aa86f2f2..2a907e9ce 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,39 +1,41 @@
-# $Id: PKGBUILD 138685 2011-09-27 16:03:39Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 145260 2011-12-20 17:23:04Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
-depends=("libxfce4ui" 'libwnck' 'hicolor-icon-theme')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('41b730d5abf39a69fc3b221728ddaa75')
-sha1sums=('7822408eaddd9fc4937d9e6825eda7d56dc46b06')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-startup-notification \
-	--enable-randr \
-	--enable-compositor \
-	--enable-xsync \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-startup-notification \
+    --enable-randr \
+    --enable-compositor \
+    --enable-xsync \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfwm4/xfwm4.install b/extra/xfwm4/xfwm4.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfwm4/xfwm4.install
+++ b/extra/xfwm4/xfwm4.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et: