Mon Jan 16 23:15:10 UTC 2012

6 files changed, 48 insertions, 39 deletions

diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 3af4f8303..4233cd589 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145313 2011-12-21 18:57:01Z daniel $
+# $Id: PKGBUILD 146655 2012-01-15 12:58:26Z daniel $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
@@ -6,9 +6,9 @@ pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.2.3.2
-_pkgver=4.2.3-P1
+_pkgver=4.2.3-P2
 
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -16,7 +16,7 @@ source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
         dhcp4 dhcp6 dhcp
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('04599f1557a5cafd10d7745267a68c8b'
+md5sums=('14f57fd580d01633d0fad4809007a801'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 72aa5ebb6..d64e4b75b 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146056 2012-01-04 19:11:47Z bisson $
+# $Id: PKGBUILD 146643 2012-01-15 09:45:20Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.7.0
+pkgver=2.7.1
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('ff52b67a9456e1afe18c9c86a8f84c9dc16b9414'
+sha1sums=('16e549f5e602c7834dcc35875e375f1e660a627d'
           '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index e934f7b2f..f1d7baaae 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 145070 2011-12-16 11:39:16Z tpowa $
+# $Id: PKGBUILD 146639 2012-01-15 08:31:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
 depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse')
-makedepends=('texi2html' 'perl' 'python2')
+makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
 conflicts=('qemu')
@@ -29,11 +29,26 @@ build()
                 --audio-card-list=ac97,sb16,es1370,hda \
                 --enable-docs
     make
+
+    # Use latest seabios version
+    # https://bugs.archlinux.org/task/27616
+    cd ${srcdir}/
+    git clone git://git.seabios.org/seabios.git
+    cd seabios
+    find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+    make clean
+    make
 }
+
 package()
 {
     cd ${srcdir}/${pkgname}-${pkgver}
     make DESTDIR=${pkgdir} install
+    
+    # Use latest seabios version
+    # https://bugs.archlinux.org/task/27616
+    cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin
+
     # symbolic link for backwards compatibility
     ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
     # symbolic link for to qemu binary for emulator apps
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index d97e0dd38..35eb90993 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,32 +1,28 @@
-# $Id: PKGBUILD 145457 2011-12-22 17:55:49Z ibiru $
+# $Id: PKGBUILD 146665 2012-01-15 21:21:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1.git20111222
+pkgver=2.95
 pkgrel=1
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject'
-         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python2-mako' 'grilo' 'dconf' 'libnotify')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
+depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3'
+         'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser')
+makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
             'brasero: cd burning')
-options=('!libtool' '!emptydirs' '!strip')
+options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('06cb3dda1871060c192e32c7f8237c046d120946a3647ebe2041695bce90a839')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS="$CFLAGS -g -O1"
-  export CXXFLAGS="$CXXFLAGS -g -O1"
-  PYTHON=/usr/bin/python2 ./autogen.sh
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/rhythmbox \
       --localstatedir=/var --disable-static \
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index b7782644e..01142b16b 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 133084 2011-07-27 18:50:53Z bisson $
+# $Id: PKGBUILD 146641 2012-01-15 08:38:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc='Multilingual input method library'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications'
             'gnome-panel: gnome applet indicator')
 options=('!libtool')
 source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9001955f9efbd3cf23c9ad62c027f44060553fa8')
+sha1sums=('4982178aca6ee1ae775fc2a9b4bbb7a66e97cbd4')
 
 install=install
 
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index fae945242..236d8ba93 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143639 2011-11-27 23:44:53Z eric $
+# $Id: PKGBUILD 146636 2012-01-15 06:31:34Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,24 +6,24 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=353
-__hgrev=379a6398d462
+_patchlevel=401
+__hgrev=0dabc2ce136c
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
-source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz
+makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim gvim.desktop urxvt-mouse.diff)
-sha1sums=('1713682c077d26ec3d3e8d0d18bad88a2a447fd5'
+        vimrc archlinux.vim gvim.desktop)
+sha1sums=('99498cb48c0c720ae9972a6cd33d4926bdf733b7'
+          '72e9e1eff158e8acceeeb96279085214cbefb3ac'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
-          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba'
-          '54d8edec6a450a529ba11bab45c5685b1e7c2e84')
+          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -53,8 +53,6 @@ mksource() {
 build() {
   cd "${srcdir}"
 
-  (cd ${pkgname}-${pkgver}; patch -p1 -i ../urxvt-mouse.diff)
-
   cp -a ${pkgname}-${pkgver} vim-build
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
@@ -87,7 +85,7 @@ build() {
     --enable-gpm --enable-acl --with-x=yes \
     --enable-gui=gtk2 --enable-multibyte --enable-cscope \
     --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-python3interp --enable-rubyinterp --enable-luainterp
+    --disable-python3interp --enable-rubyinterp --enable-luainterp
 
   make
 }
@@ -122,7 +120,7 @@ package_vim() {
 package_gvim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua')
+           'desktop-file-utils' 'gtk2' 'lua' 'python2')
   provides=("vim=${pkgver}-${pkgrel}")
   conflicts=('vim')
   install=gvim.install