Sun Aug 14 23:14:32 UTC 2011

9 files changed, 143 insertions, 63 deletions

diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index c8356dcbe..4ceec50e9 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $
+# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=bftpd
-pkgver=3.4
+pkgver=3.6
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
         bftpd.logrotate
         bftpd.pam
         bftpd.xinetd)
-md5sums=('dcee04b5fad8c918e86c49712424fcdd'
+md5sums=('7c45b158646e3b266530bf46778fc2d0'
          '56a1bf7738a6db2b2cff89e611f4f11a'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index 8c89b7db0..50bbb6257 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 134409 2011-08-03 18:32:37Z angvp $
+# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=bmp
 pkgver=0.9.7.1
-pkgrel=6
+pkgrel=8
 pkgdesc="gtk2 port of xmms"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/beepmp/"
 license=('GPL')
-depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
+depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
 makedepends=('libxt')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
+install=bmp.install
+source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
+        ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
 md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
          'fa1bdf5a8d03e8539a6bed5caa471176'
          '42ad4109ddb66024d4c6d1f3e572ab86')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i ../${pkgver}-visualization.patch 
   patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
   ./configure --prefix=/usr --mandir=/usr/share/man 
@@ -26,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/bmp/bmp.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 122ba1559..6dc563a50 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $
+# $Id: PKGBUILD 135366 2011-08-13 08:45:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.6.95
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
+depends=('kdebase-runtime' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6')
+source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
+sha1sums=('7f0366cc6144ea684c571ed3876dd0eac6d72fb6')
 
 build() {
   cd "${srcdir}"
@@ -21,7 +21,8 @@ build() {
   cd build
   cmake ../smokeqt-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Qwt5=OFF
   make
 }
 
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 91e94bb66..8f6b5e32e 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,17 +17,23 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
+        nm09-more.patch
+        ticket-14351-multiple-display-of-room-members.patch)
 md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
-         'a673659d86c7a65aa710f7c8c7feda82')
+         'a673659d86c7a65aa710f7c8c7feda82'
+         '47f16f838b741cfdeda18d7b08a7b816')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Further fixes for NetworkManager 0.9
-  # (http://developer.pidgin.im/ticket/13859)
+  # http://developer.pidgin.im/ticket/13859
   patch -Np1 -i "$srcdir/nm09-more.patch"
 
+  # Fix upstream issue #14351: multiple display of room members
+  # http://developer.pidgin.im/ticket/14351
+  patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch"
+
   # Use Python 2
   sed -i 's/env python$/\02/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
@@ -74,8 +80,7 @@ package_pidgin(){
 
 package_libpurple(){
   pkgdesc="IM library extracted from Pidgin"
-  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss'
-           'cyrus-sasl-plugins')
+  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
   optdepends=('avahi: Bonjour protocol support'
               'dbus-python: for purple-remote and purple-url-handler')
 
diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
new file mode 100644
index 000000000..bf0966891
--- /dev/null
+++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+#  from [cd6817f4863abafef969359f65cc025f9483b401]
+#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c	cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c	19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ 	}
+ 
+ 	g_hash_table_remove_all(chat->users);
+-	chat->users = NULL;
+ 
+ 	g_list_free(users);
+ 	chat->in_room = NULL;
diff --git a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch
new file mode 100644
index 000000000..fe5a807ee
--- /dev/null
+++ b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch
@@ -0,0 +1,43 @@
+From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001
+From: Paul Khuong <pvk@pvk.ca>
+Date: Wed, 3 Aug 2011 10:20:41 -0400
+Subject: [PATCH] Fix version string parsing for Linux 3.0
+
+ Stop assuming the presence of minor and patch version numbers; missing
+ values are defaulted to 0 (e.g. 3.0.0).
+
+ Reported by a few people on IRC.
+---
+ src/runtime/linux-os.c |   14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
+index db72fa6..e262f41 100644
+--- a/src/runtime/linux-os.c
++++ b/src/runtime/linux-os.c
+@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[])
+     int patch_version;
+     char *p;
+     uname(&name);
++
+     p=name.release;
+     major_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    minor_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    patch_version = atoi(p);
++    minor_version = patch_version = 0;
++    p=strchr(p,'.');
++    if (p != NULL) {
++            minor_version = atoi(++p);
++            p=strchr(p,'.');
++            if (p != NULL)
++                    patch_version = atoi(++p);
++    }
++
+     if (major_version<2) {
+         lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n",
+              major_version);
+-- 
+1.7.6
+
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 8f961492e..9c23c55fc 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,32 +1,37 @@
-# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $
+# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Leslie Polzer (skypher) 
+# Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
 pkgver=1.0.50
-pkgrel=1
+pkgrel=2
 pkgdesc="Steel Bank Common Lisp"
+url="http://www.sbcl.org/"
 arch=('i686' 'x86_64')
 license=('custom')
 depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
-source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
-md5sums=('74ce9b24516885d066ec4287cde52e8c'
-         '7ac0c1936547f4278198b8bf7725204d')
-url="http://www.sbcl.org/"
 install=sbcl.install
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
+        "arch-fixes.lisp"
+        "0001-Fix-version-string-parsing-for-Linux-3.0.patch")
+md5sums=('74ce9b24516885d066ec4287cde52e8c'
+         '7ac0c1936547f4278198b8bf7725204d'
+         '7af58d1de2d788ad6a8d82c89279a75f')
 
 build() {
-  export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
   export GNUMAKE="make -e"
 
   # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
-  export LINKFLAGS="$LD_FLAGS" 
+  export LINKFLAGS="$LDFLAGS"
   unset LDFLAGS
-  cd ${startdir}/src/${pkgname}-${pkgver}
+
   # Make a multi-threaded SBCL, disable LARGEFILE  
   cat >customize-target-features.lisp <<EOF
 (lambda (features)
@@ -36,38 +41,34 @@ build() {
   (disable :largefile)))
 EOF
 
+  # fix build against 3.0-ARCH
+  patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch"
+
   sh make.sh sbcl
-  mkdir -p ${startdir}/pkg/usr
-  pushd doc/manual
-  make info || return 1
-  popd 
-  INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
+  make -C doc/manual info
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  INSTALL_ROOT="$pkgdir/usr" sh install.sh
 
   src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp
   mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
 
-# sources
-  mkdir -p ${startdir}/pkg/usr/share/sbcl-source
-  cp -R -t ${startdir}/pkg/usr/share/sbcl-source \
-    ${startdir}/src/${pkgname}-${pkgver}/{src,contrib}
+  # sources
+  mkdir -p "$pkgdir/usr/share/sbcl-source"
+  cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib}
 
-# drop unwanted files
-  find ${startdir}/pkg/usr/share/sbcl-source -type f \
-    -name \*.fasl -or \
-    -name \*.o -or \
-    -name \*.log -or \
-    -name \*.so -or \
-    -name a.out -delete
-
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm
+  # license
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
+                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 
-  find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete
+  # drop unwanted files
+  find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete
+  find "$pkgdir/usr/share/sbcl-source" -type f \
+    \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete
 
-  rm $startdir/pkg/usr/share/info/dir
-  gzip -9nf $startdir/pkg/usr/share/info/*
+  rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm}
 
-  # license
-  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 6cf58ac50..3fb5d3b86 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $
+# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.4
+pkgver=0.8.5
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('qt')
 optdepends=('qt')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7')
+sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"