Thu Oct 13 23:14:38 UTC 2011

8 files changed, 87 insertions, 33 deletions

diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD
index 521c7fd0e..24f9f9906 100644
--- a/community/audex/PKGBUILD
+++ b/community/audex/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37808 2011-01-17 23:22:59Z lcarlier $
+# $Id: PKGBUILD 56794 2011-10-12 23:16:45Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: mightyjaym <jmambrosino@gmail.com>
 # Contributor: moostik <mooostik_at_gmail.com>
 
 pkgname=audex
 pkgver=0.74b1
-pkgrel=1
+pkgrel=2
 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE"
 arch=('i686' 'x86_64')
 url="http://kde.maniatek.com/audex/"
@@ -17,11 +17,16 @@ optdepends=('vorbis-tools: OGG encoder'
 	'flac: FLAC encoder'
 	'lame: MP3 encoder')
 install=${pkgname}.install
-source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('20fdf9a0f89c08f44a151b6bdaab8782')
+source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz"
+        "google_regex.patch")
+md5sums=('20fdf9a0f89c08f44a151b6bdaab8782'
+         '77b33d8daead89d5f4f15b78a1cd1d55')
 
 build() {
   cd ${srcdir}
+  # fix bug FS#25193
+  patch -Np0 -i  google_regex.patch
+
   mkdir build
   cd build
 
diff --git a/community/audex/google_regex.patch b/community/audex/google_regex.patch
new file mode 100644
index 000000000..86917e66f
--- /dev/null
+++ b/community/audex/google_regex.patch
@@ -0,0 +1,14 @@
+--- audex-0.74b1/utils/coverfetcher.cpp	2011-01-15 12:06:25.000000000 +0100
++++ audex-0.74b1/utils/coverfetcher_new.cpp	2011-07-20 18:43:37.554588883 +0200
+@@ -162,7 +162,10 @@
+   cover_tbnids.clear();
+   cover_thumbnails.clear();
+ 
+-  QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
++  QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
++  QString html = xml;
++  html.replace( QLatin1String("&amp;"), QLatin1String("&") );
++
+   rx.setMinimal(TRUE);
+   
+   int pos = 0; int i = 0;
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index f9f09a391..73c7293fe 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 55842 2011-09-23 16:15:44Z spupykin $
+# $Id: PKGBUILD 56777 2011-10-12 06:44:39Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
 pkgver=0.9.0pre3
-pkgrel=1
+pkgrel=3
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64')
 url="http://gnunet.org"
 options=('!libtool')
 license=('GPL')
-depends=('gnunet' 'libnotify' 'libglade' 'adns')
-makedepends=('pkgconfig' 'glade')
-source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz)
-md5sums=('42f90a00aee541cef576ead682d7fb44')
+depends=('gnunet' 'glade' 'adns')
+makedepends=('pkgconfig')
+source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz
+        drop_gtk2.patch)
+md5sums=('42f90a00aee541cef576ead682d7fb44'
+         'f709c0195beffd0ca64d498be83a118b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-gnunet=/usr --disable-libgksu2
+  patch -Np1 -i  $srcdir/drop_gtk2.patch
+  autoreconf -fi
+  ./configure --prefix=/usr --with-gnunet=/usr
   make
 }
 
diff --git a/community/gnunet-gtk/drop_gtk2.patch b/community/gnunet-gtk/drop_gtk2.patch
new file mode 100644
index 000000000..1ae4fda1f
--- /dev/null
+++ b/community/gnunet-gtk/drop_gtk2.patch
@@ -0,0 +1,11 @@
+diff -Nur gnunet-gtk-0.9.0pre3.orig/configure.ac gnunet-gtk-0.9.0pre3/configure.ac
+--- gnunet-gtk-0.9.0pre3.orig/configure.ac	2011-10-12 06:30:21.001993062 +0000
++++ gnunet-gtk-0.9.0pre3/configure.ac	2011-10-12 06:30:50.695578118 +0000
+@@ -169,7 +169,6 @@
+ AC_MSG_CHECKING(for gtk)
+ without_gtk=true
+ AM_PATH_GTK_3_0(3.0.0,without_gtk=false,)
+-AM_PATH_GTK_2_0(2.6.0,without_gtk=false,)
+ AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
+ if test $without_gtk != true
+ then
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 52487704d..2d573613f 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 55840 2011-09-23 16:14:42Z spupykin $
+# $Id: PKGBUILD 56776 2011-10-12 06:43:47Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
 pkgver=0.9.0pre3
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64')
 url="http://gnunet.org"
 license=('GPL')
-depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'guile' 'curl' 'libglade'
-	 'adns' 'libmicrohttpd')
+depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' 'libmicrohttpd')
 makedepends=('gettext' 'pkgconfig')
 backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index dc74aaaf3..8dd14decd 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 33729 2010-11-28 11:00:58Z svenstaro $
+# $Id: PKGBUILD 56796 2011-10-12 23:30:10Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
@@ -7,12 +7,13 @@
 
 pkgname=irrlicht
 pkgver=1.7.2
-pkgrel=1
+pkgrel=3
 pkgdesc="An open source high performance realtime 3D graphics engine."
 arch=('i686' 'x86_64')
 url="http://irrlicht.sourceforge.net/"
 license=('ZLIB')
-depends=('mesa' 'libjpeg' 'bzip2')
+depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
+makedepends=('mesa')
 source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip")
 md5sums=('eb627d4c432bf73f12bc6d9ddc700b07')
 
@@ -21,6 +22,7 @@ build() {
 
   sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \
          -e '/^#.*NON_SYSTEM_JPEG/d' \
+         -e '/^#.*NON_SYSTEM_LIB_PNG/d' \
          -e '/^#.*NON_SYSTEM_BZLIB/d' \
          include/IrrCompileConfig.h
 
@@ -28,17 +30,21 @@ build() {
   sed -i -e '/^CXXFLAGS/s:-g.*::' \
 	 -e '/^CXXFLAGS/s:-Wall::' \
 	 -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \
-	 -e '/^CXXINCS/s:-Izlib -Ijpeglib::' \
+	 -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
 	 -e '/^ZLIBOBJ/d' \
 	 -e '/^JPEGLIBOBJ/d' \
 	 -e '/^BZIP2OBJ/d' \
+	 -e '/^LIBPNGOBJ/d' \
 	 -e '/.o=.d/d' \
-	 -e '/^sharedlib: LDFLAGS/s:+=:+= -lGL -lXxf86vm -ljpeg -lbz2 -lz:' \
+	 -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \
 	 -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
 	 -e 's/0-SVN/1/' \
 	 -e 's/.$(VERSION_MINOR) -o/ -o/' \
 	 Makefile
 
+  sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \
+      CImageLoaderPNG.cpp
+
   make sharedlib
 
   make
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 145203973..fa2962fe9 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 49744 2011-06-20 20:11:17Z ibiru $
+# $Id: PKGBUILD 56797 2011-10-12 23:37:11Z ibiru $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
 
 pkgname=mysql-workbench
 epoch=1
-pkgver=5.2.34
-pkgrel=2
+pkgver=5.2.35
+pkgrel=1
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64')
 url="http://wb.mysql.com/"
 license=('GPL2')
 depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl'
          'libsigc++' 'python-paramiko' 'python-pexpect' 'libgnome-keyring')
-makedepends=('boost' 'curl' 'mesa')
+makedepends=('boost' 'curl' 'mesa' 'python-sphinx')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
         ArchLinux.xml arch.patch python27.patch gcc46.patch)
-md5sums=('781a4e9f6b5573b06a838d53ddb9136d'
+md5sums=('e8b158d2ba0413f5659cda7da9cec63e'
          'c2f986cd5737413d020c55db32713c48'
          '23430d24400fd65c9fd872bd8e2411e5'
          '47bc4cdfaa035a0132392e94c462ebf7'
@@ -38,17 +38,32 @@ build() {
   rm -rf ext/boost
   rm -rf ext/libsigc++
 
-  export CPPFLAGS=$(pkg-config --cflags sigc++-2.0)
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-
   ./autogen.sh --prefix=/usr --disable-debug --disable-static
   make
+
+  pushd ext/mysql-utilities
+  python2 setup.py build
+  popd
+
+  pushd ext/connector-python
+  python2 setup.py build
+  popd
 }
 
 package() {
   cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
 
   make DESTDIR="${pkgdir}" install
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py
-  sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py
+
+  pushd ext/mysql-utilities
+  python2 setup.py install --skip-profile --root $pkgdir --prefix=/usr --optimize=1
+  popd
+
+  pushd ext/connector-python
+  python2 setup.py install --root $pkgdir --prefix=/usr --optimize=1
+
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+      -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+      -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+      $(find ${pkgdir} -name '*.py')
 }
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 8739d2a86..7b0ef8200 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 56277 2011-10-04 15:42:56Z ibiru $
+# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -152,7 +152,7 @@ package_virtualbox-archlinux-additions(){
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_110.so \
+    install -D vboxvideo_drv_111.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"