Don't do changes probably not affecting the packages.

19 files changed, 81 insertions, 107 deletions

diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index fb52d4dfc..d2a485aeb 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.19-checkpw.c.patch
         cyrus-sasl-2.1.22-crypt.patch
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
index dfb974f82..19ac5cb8a 100644
--- a/extra/eject/PKGBUILD
+++ b/extra/eject/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=eject
 pkgver=2.1.5
 pkgrel=7
-pkgdesc="A program for ejecting removable media under software control"
+pkgdesc="A program for ejecting removable media under software control."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eject.sourceforge.net/"
 license=('GPL')
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index 7ad4067b5..d57d2bf5d 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=foobillard++
 pkgver=3.42beta
 pkgrel=3
 pkgdesc="An OpenGL billiard game"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
 depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index b1b19646b..41ddd2390 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.18
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 2ea27fe5a..d7049afb6 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gssdp
 pkgver=0.12.0
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=('LGPL')
 depends=('libsoup')
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index ec068d19b..a4d84e5e3 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -28,7 +28,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
-  if [ "$CARCH" == "x86_64" -o "$CARCH" == "mips64el" ]; then
+  if [ "$CARCH" != "i686" ]; then
          yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1
     else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
   fi
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 8eadb0dce..07b0f5aaa 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A JSON implementation in C"
 url="http://oss.metaparadigm.com/json-c/"
 license=("MIT")
-arch=(mips64el)
+arch=('i686' 'x86_64' mips64el')
 depends=('glibc')
 source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('3a13d264528dcbaf3931b0cede24abae')
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index aee0abad5..43dd4017f 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcap-ng
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
diff --git a/extra/libdc1394/fix-videodev.h.patch b/extra/libdc1394/fix-videodev.h.patch
deleted file mode 100644
index 560337978..000000000
--- a/extra/libdc1394/fix-videodev.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
-From: David Moore <david.moore@gmail.com>
-Date: Sun, 27 Mar 2011 22:48:15 -0700
-Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-
----
- libdc1394/ChangeLog            |    3 +++
- libdc1394/configure.in         |    3 +++
- libdc1394/examples/Makefile.am |    2 ++
- 3 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
-index e1355de..536ccae 100644
---- a/libdc1394/ChangeLog
-+++ b/libdc1394/ChangeLog
-@@ -1,3 +1,6 @@
-+2011-03-27  David Moore  <david.moore@gmail.com>
-+	* Conditionally compile dc1394_vloopback only when linux/video.h exists
-+
- 2011-01-02  David Moore  <david.moore@gmail.com>
- 	* dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
- 	* Update NEWS, README, AUTHORS and version for release 2.1.3.
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/libdc1394/configure.in
-+++ b/libdc1394/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/libdc1394/examples/Makefile.am
-+++ b/libdc1394/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif
--- 
-1.7.0.1
-
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index b14b6b5af..409c2b1bc 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mash
 pkgver=0.1.0
 pkgrel=2
 pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 58731bedc..cc75d6ae4 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.18.3
 pkgrel=2
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'libtool')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 02dc5a056..c70baf064 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index f4fc586b5..613310cf1 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-farstream
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
-arch=(mips64el)
+arch=(i686 x86_64 mips64el)
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'farsight2')
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 05f2acca4..12dbdf44f 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.12.10
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
new file mode 100644
index 000000000..c5e0b99ab
--- /dev/null
+++ b/extra/valgrind/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.7.0
+pkgrel=2
+pkgdesc="A tool to help find memory-management problems in programs"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://valgrind.org/"
+depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+         'f534b79b358cdced0319b375aafde4d5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000..fa400b953
--- /dev/null
+++ b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6422,7 +6433,7 @@
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 4a411d6ca..525f48584 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=varnish
 pkgver=3.0.2
 pkgrel=5
 pkgdesc="High-performance HTTP accelerator"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 724d79bb1..5bfabe4b1 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('gettext' 'intltool')
+makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
deleted file mode 100644
index 01ed040d4..000000000
--- a/extra/xorg-server/vbe-fix-malloc-size-bug.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 24 Feb 2011 21:06:34 +0000
-Subject: vbe: Fix malloc size bug
-
-v2: Slightly more obvious sizing math.
-
-==14882== Invalid write of size 2
-==14882==    at 0x6750267: VBEGetVBEInfo (vbe.c:400)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-==14882==  Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
-==14882==    at 0x4A0640D: malloc (vg_replace_malloc.c:236)
-==14882==    by 0x675024B: VBEGetVBEInfo (vbe.c:398)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
----
-diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
-index 7a64a4a..1d3775b 100644
---- a/hw/xfree86/vbe/vbe.c
-+++ b/hw/xfree86/vbe/vbe.c
-@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
-     i = 0;
-     while (modes[i] != 0xffff)
- 	i++;
--    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);
-+    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
-     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
-     block->VideoModePtr[i] = 0xffff;
- 
---
-cgit v0.8.3-6-g21f6