Sun Jul 15 00:03:24 UTC 2012

9 files changed, 122 insertions, 36 deletions

diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 0d1b43b77..4f24d6fdd 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 162028 2012-06-19 01:01:27Z dan $
+# $Id: PKGBUILD 163499 2012-07-13 14:44:33Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.1.1
+pkgver=1.8.1.2
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('a08c43c5675f79e0787e700c2d39ee33')
-sha1sums=('51184af9f27d6572826581de0da5b6b044e34d94')
+md5sums=('9c62259c34d51d839dafd1f0d5d85f17')
+sha1sums=('a11e65a597019510051290d2af0e6f379838b9c5')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 4026a264e..29876c073 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162371 2012-06-26 03:37:25Z dan $
+# $Id: PKGBUILD 163497 2012-07-13 14:43:17Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.11.1
+pkgver=1.7.11.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -100,7 +100,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('d09664978931d215e43241689eb09371b509c7ce'
-          'e2defbf75ff15d7684d70457e41bc45fb22f0e1f'
+sha1sums=('f67b4f6c0277250411c6872ae7b8a872ae11d313'
+          '78b46ca7b5037c61a58086879869dadeac9eea3e'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 7c8a9dd95..d1e213e76 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162358 2012-06-25 18:51:22Z foutrelis $
+# $Id: PKGBUILD 163501 2012-07-13 16:26:14Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('a61e3b844061f5324512a16d6d16984c'
+md5sums=('45dd2c16c8c4d1a39e830e45745c4e25'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 648859602..b64cd54e8 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 161651 2012-06-13 12:26:10Z tpowa $
+# $Id: PKGBUILD 163504 2012-07-13 16:36:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="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://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}-1.tar.bz2
-        65-kvm.rules)
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+        65-kvm.rules
+        qemu-glibc-2.16-build.patch)
 options=(!strip)
 
 build()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's/lib64/lib/g' x86_64.ld
+  # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git
+  # fix changes from glibc-2.16
+  patch -Np1 -i ../qemu-glibc-2.16-build.patch
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
@@ -42,5 +46,6 @@ package() {
     done
 
 }
-md5sums=('f5c85c229b780bc39268845b6f365fc1'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
+md5sums=('f691baa30e8fb40f37f2797fba892e12'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf'
+         '8687179e77ab954c4a43017d030f7349')
diff --git a/extra/qemu/qemu-glibc-2.16-build.patch b/extra/qemu/qemu-glibc-2.16-build.patch
new file mode 100644
index 000000000..08948fec6
--- /dev/null
+++ b/extra/qemu/qemu-glibc-2.16-build.patch
@@ -0,0 +1,70 @@
+From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 5 Jul 2012 14:28:03 +0100
+Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
+
+glibc 2.16 will remove the undocumented definition of 'struct siginfo'
+from <bits/siginfo.h>.
+
+This change is already present in glibc 2.15.90, so qemu compilation
+of certain targets (eg. cris-user) breaks.
+
+This struct was always typedef'd to be the same as 'siginfo_t' which
+is what POSIX documents, so use that instead.
+
+Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+---
+ linux-user/signal.c |    8 ++++----
+ user-exec.c         |    2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 43346dc..108dff9 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
+     * Arguments to signal handler:
+     *
+     *   a0 = signal number
+-    *   a1 = pointer to struct siginfo
++    *   a1 = pointer to siginfo_t
+     *   a2 = pointer to struct ucontext
+     *
+     * $25 and PC point to the signal handler, $29 points to the
+@@ -3255,7 +3255,7 @@ struct target_signal_frame {
+ };
+ 
+ struct rt_signal_frame {
+-    struct siginfo info;
++    siginfo_t info;
+     struct ucontext uc;
+     uint32_t tramp[2];
+ };
+@@ -3474,9 +3474,9 @@ struct target_signal_frame {
+ };
+ 
+ struct rt_signal_frame {
+-        struct siginfo *pinfo;
++        siginfo_t *pinfo;
+         void *puc;
+-        struct siginfo info;
++        siginfo_t info;
+         struct ucontext uc;
+         uint8_t retcode[8];       /* Trampoline code. */
+ };
+diff --git a/user-exec.c b/user-exec.c
+index b2a4261..1a9c276 100644
+--- a/user-exec.c
++++ b/user-exec.c
+@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+ int cpu_signal_handler(int host_signum, void *pinfo,
+                        void *puc)
+ {
+-    struct siginfo *info = pinfo;
++    siginfo_t *info = pinfo;
+     struct ucontext *uc = puc;
+     unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
+     uint32_t insn = *(uint32_t *)pc;
+-- 
+1.7.10.4
+
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index f6c46d1bf..e90fa2de2 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160692 2012-06-03 19:17:38Z tpowa $
+# $Id: PKGBUILD 163488 2012-07-13 10:14:32Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
 
 pkgname=slim
-pkgver=1.3.3
-pkgrel=5
+pkgver=1.3.4
+pkgrel=1
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -19,17 +19,15 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'pam.d'
         'logrotate'
         'slim.service'
-        'ptr_pam.patch'
         'session-name.patch'
-        'fix-numlock-1.3.3.patch')
+        'libpng-1.4+-support.patch')
 
 install=install
 
 build() {
         cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling
+        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
         cd ${srcdir}
         mkdir build
         cd build
@@ -55,11 +53,10 @@ package() {
         # install systemd files
         install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
 }
-md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
+md5sums=('51543533e492b41007811f7d880720fa'
          'd8ea9c4dee2811524b67f4f666311a1f'
          'd33edc74724c6ca00445767ce38fc732'
          '43da096480bf72c3ccec8ad8400f34f0'
-         '7c0bf1fb6292537e2c63ec04f8532079'
-         'ae4b237d472ec5d373e30080aa0ff804'
+         'a5d6bde9e63899df7d2081e1585bbe54'
          'ebcb6829028615686de7b64ceeaaf8ed'
-         '6c29c93370e44ed310ff30132424b619')
+         '6d19bd7a91592ed2bb902b22b9594565')
diff --git a/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch
new file mode 100644
index 000000000..57b39272b
--- /dev/null
+++ b/extra/slim/libpng-1.4+-support.patch
@@ -0,0 +1,14 @@
+--- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+                                 (png_infopp) NULL);
+     }
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++    if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+     if (setjmp(png_ptr->jmpbuf)) {
++#endif
+         goto png_destroy;
+     }
+ 
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
index 18d8c99be..b894085a0 100644
--- a/extra/slim/slim.service
+++ b/extra/slim/slim.service
@@ -6,4 +6,4 @@ After=systemd-user-sessions.service
 ExecStart=/usr/bin/slim -nodaemon
 
 [Install]
-WantedBy=graphical.target
+Alias=display-manager.service
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 507eaed33..d0c30fd0b 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160931 2012-06-07 03:39:59Z tdziedzic $
+# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=547
-__hgrev=6f2497d0c277
+_patchlevel=600
+__hgrev=11d40fc82f11
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-sha1sums=('2c4f78a66b6ad7a759122d1f66c74079b678f39c'
-          '999f527d82a4c7818d017e3b8230e27950e87718'
+sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda'
+          '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'