Tue Jul 19 23:13:07 UTC 2011

11 files changed, 116 insertions, 59 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index c0e07269b..6455c3d0f 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 129963 2011-06-30 17:15:51Z bisson $
+# $Id: PKGBUILD 132002 2011-07-18 22:19:52Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=2.5.3
-pkgrel=1
-pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
+pkgver=3.0
+pkgrel=2
+pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
 license=('GPL3')
-depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
+depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('b40f140ebeb5d767bd865945b7eb5527c265beb7')
+sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index adefe545d..3a3033792 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125706 2011-05-28 10:53:12Z ibiru $
+# $Id: PKGBUILD 131948 2011-07-18 05:06:18Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a2e947146c83d60db2e4f858917c906733037f77067a7081de7a2ff3716fbe7a')
+sha256sums=('e691243f8bf08c7dd6437bb6862e39f2d4ccc612a78bd8f2235c1f116f790d21')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 285a6ba8e..2f92da9a0 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 130320 2011-07-05 06:30:24Z bisson $
+# $Id: PKGBUILD 131965 2011-07-18 13:37:20Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
 pkgver=1.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url='http://hyperrate.com/dir.php?eid=67'
 depends=('gtk2' 'libxtst')
-makedepends=('qt' 'gtk3' 'anthy')
+makedepends=('qt' 'gtk3' 'anthy' 'libchewing')
 optdepends=('qt: support for qt4 input method'
             'gtk3: support for gtk3 input method'
-            'anthy: support for anthy input method')
+            'anthy: support for anthy input method'
+            'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
         'qt4-lib64.patch')
 sha1sums=('36ed067b354abb1e0707a4b327e2ad624cb6f88d'
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 97b384792..5d518186f 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130213 2011-07-04 12:50:49Z ibiru $
+# $Id: PKGBUILD 131990 2011-07-18 19:11:01Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=js
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="JavaScript interpreter and libraries"
 arch=(i686 x86_64)
 url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
@@ -17,7 +17,11 @@ md5sums=('a4574365938222adca0a6bd33329cb32'
          '364834a8391888642c53d78c3a949d94')
 build() {
   cd "$srcdir/$pkgname-$pkgver/js/src"
+
   patch -Np0 -i $srcdir/js185-destdir.patch
+
+  export CXXFLAGS="$CXXFLAGS -DJS_C_STRINGS_ARE_UTF8"
+
   ./configure --prefix=/usr --with-system-nspr \
      --enable-threadsafe
 
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD
index 9f3595deb..0d257544b 100644
--- a/extra/mod_perl/PKGBUILD
+++ b/extra/mod_perl/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 129799 2011-06-28 23:07:22Z angvp $
+# $Id: PKGBUILD 131985 2011-07-18 18:21:39Z foutrelis $
 # Maintainer: Firmicus <francois.archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=mod_perl
 pkgver=2.0.5
-pkgrel=7
+pkgrel=8
 pkgdesc="Apache module that embeds the Perl interpreter within the server"
 url="http://search.cpan.org/dist/${pkgname}/"
 depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
 license=('APACHE')
 arch=('i686' 'x86_64')
 options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz)
-md5sums=('03d01d135a122bd8cebd0cd5b185d674')
+source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz
+       nolfs.patch)
+md5sums=('03d01d135a122bd8cebd0cd5b185d674'
+         '088e082afef57f92f234a01269e24ce5')
 
 build() {
   cd  ${srcdir}/${pkgname}-${pkgver}
+
+  # Patch from openSUSE to fix segfaults on i686 (FS#25008):
+  #   avoid a conflict between apache's LARGEFILE64_SOURCE and perl's
+  #   FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl
+  #   structures to be invalid if only the apache flags are used
+  patch -Np1 -i "$srcdir/nolfs.patch"
+
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs
   make
diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch
new file mode 100644
index 000000000..3eb345b66
--- /dev/null
+++ b/extra/mod_perl/nolfs.patch
@@ -0,0 +1,14 @@
+Index: mod_perl-2.0.5/lib/Apache2/Build.pm
+===================================================================
+--- mod_perl-2.0.5.orig/lib/Apache2/Build.pm	2011-02-02 21:23:47.000000000 +0100
++++ mod_perl-2.0.5/lib/Apache2/Build.pm	2011-05-26 17:12:46.276946520 +0200
+@@ -2147,7 +2147,8 @@ sub has_large_files_conflict {
+     # with it is that we didn't have such a case yet, but may need to
+     # deal with it later
+ 
+-    return $perl_lfs64 ^ $apr_lfs64;
++    return 0;
++    # $perl_lfs64 ^ $apr_lfs64;
+ }
+ 
+ # if perl is built with uselargefiles, but apr not, the build won't
diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD
index 0ef385d8f..bc7c56efa 100644
--- a/extra/pygtk/PKGBUILD
+++ b/extra/pygtk/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 117387 2011-04-01 12:58:54Z heftig $
+# $Id: PKGBUILD 131736 2011-07-14 11:07:45Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the GTK widget set"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python-numpy' 'pygobject-devel')
-optdepends=('python-numpy')
+makedepends=('python2-numpy' 'pygobject-devel')
+optdepends=('python2-numpy')
 options=('!libtool')
 url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         python27.patch)
 sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
             '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index f7aaa3edf..699137cf6 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 110670 2011-02-21 12:18:28Z stephane $
+# $Id: PKGBUILD 131668 2011-07-13 13:42:02Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=python-numpy
-pkgname=('python2-numpy' 'python3-numpy')
-pkgver=1.5.1
-pkgrel=2
+pkgname=('python2-numpy' 'python-numpy')
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
 source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('376ef150df41b5353944ab742145352d')
+md5sums=('e0993c74cb8e83292e560eac1a9be8e9')
 
 build() {
   cd "${srcdir}"
@@ -33,9 +33,6 @@ build() {
 
 package_python2-numpy() {
   depends=('lapack' 'python2')
-  provides=("python-numpy=${pkgver}")
-  replaces=('python-numpy')
-  conflicts=('python-numpy')
   optdepends=('python-nose: testsuite')
 
   cd "${srcdir}/numpy-py2-${pkgver}"
@@ -50,8 +47,11 @@ package_python2-numpy() {
              $(find ${pkgdir} -name '*.py')
 }
 
-package_python3-numpy() {
+package_python-numpy() {
   depends=('lapack' 'python')
+  provides=("python3-numpy=${pkgver}")
+  replaces=('python3-numpy')
+  conflicts=('python3-numpy')
 
   cd "${srcdir}/numpy-${pkgver}"
   python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
diff --git a/extra/stardict/NetDictRequests.patch b/extra/stardict/NetDictRequests.patch
new file mode 100644
index 000000000..4d6fe145a
--- /dev/null
+++ b/extra/stardict/NetDictRequests.patch
@@ -0,0 +1,12 @@
+diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp
+--- old/dict/src/lib/compositelookup.cpp	2011-07-02 23:58:40.000000000 -0700
++++ new/dict/src/lib/compositelookup.cpp	2011-07-18 07:40:01.795710505 -0700
+@@ -50,7 +50,7 @@
+ void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
+ {
+ 	NetDictRequest request(dict_id, key);
+-	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
++	std::find(NetDictRequests.begin(), NetDictRequests.end(), request);
+ 	NetDictRequests.push_back(request);
+ }
+ 
diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD
index b02aefd11..8ce7a50e8 100644
--- a/extra/stardict/PKGBUILD
+++ b/extra/stardict/PKGBUILD
@@ -1,42 +1,48 @@
-# $Id: PKGBUILD 106155 2011-01-14 21:07:17Z bisson $
+# $Id: PKGBUILD 131980 2011-07-18 15:27:26Z bisson $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Neil Lin <neil@vip.url.com.tw>
 
 pkgname=stardict
-pkgver=3.0.2
-pkgrel=2
-pkgdesc='A powerful international dictionary written in Gtk2.'
+pkgver=3.0.3
+pkgrel=1
+pkgdesc='International dictionary software'
 arch=('i686' 'x86_64')
-url='http://stardict.sourceforge.net/'
+url='http://www.stardict.org/'
 license=('GPL')
 depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/stardict/$pkgname-$pkgver.tar.bz2"
-        'help-in-destdir.patch'
-        'as-needed.patch')
-sha1sums=('301875657cd39b5f25e5933ece22936a28db1230'
-          '0249d769e5cc85e183eb395b824342f8ca320f56'
-          '22fca061d1be23ac79da6c0ec5fc488ae0aca9c1')
+source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2"
+        'NetDictRequests.patch'
+        'gcc46.patch')
+sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
+          '97af8fdb73c8f04674234b629c6867254e9bd043'
+          '6605a9cdfc4abc2a0ab4462d1228233d34806f0a')
 
-build()
-{
-	cd "$srcdir/$pkgname-$pkgver"
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# patches accepted upstream; will be in stardict>3.0.2
-	patch -p1 -i ../help-in-destdir.patch
-	patch -p1 -i ../as-needed.patch
+	# ugly hack to avoid crashing with empty dictionaries
+	patch -p1 -i ../NetDictRequests.patch
+	patch -p1 -i ../gcc46.patch
 	automake
 
-	./configure PKG_CONFIG=/usr/bin/pkg-config --prefix=/usr \
-		--sysconfdir=/etc --mandir=/usr/share/man \
-		--disable-gnome-support --disable-schemas-install \
-		--disable-espeak --disable-gucharmap \
-		--disable-festival --disable-updateinfo
+	./configure \
+		PKG_CONFIG=/usr/bin/pkg-config \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--disable-gnome-support \
+		--disable-schemas-install \
+		--disable-espeak \
+		--disable-gucharmap \
+		--disable-festival \
+		--disable-updateinfo \
+
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/stardict/gcc46.patch b/extra/stardict/gcc46.patch
new file mode 100644
index 000000000..944b9635c
--- /dev/null
+++ b/extra/stardict/gcc46.patch
@@ -0,0 +1,11 @@
+diff -aur old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h
+--- old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 06:58:58.519404744 -0700
++++ new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 07:01:10.739734313 -0700
+@@ -26,6 +26,7 @@
+ #ifndef __TYPES_H__
+ #define __TYPES_H__
+ 
++#include <cstddef>
+ #include <math.h>
+ 
+ typedef float single;