Sat May 28 22:47:00 UTC 2011

11 files changed, 243 insertions, 34 deletions

diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index e0e61edd6..ed938ccc1 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47194 2011-05-18 15:41:47Z lfleischer $
+# $Id: PKGBUILD 48027 2011-05-27 16:02:04Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.1
+pkgrel=1
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64')
 url='http://deadbeef.sourceforge.net'
@@ -29,7 +29,7 @@ optdepends=('libvorbis: for Ogg Vorbis playback'
 options=('!libtool')
 install='deadbeef.install'
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('713c47c5e7bb9a29cd0de877aff04ae6')
+md5sums=('be8359d1bd9cf7679cf2ca748996e726')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index eeffdef55..80d18e1bd 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44283 2011-04-05 06:25:28Z lcarlier $
+# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -19,7 +19,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.0
+pkgver=2.23.1
 pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
@@ -35,10 +35,11 @@ groups=('gambas2')
 replaces=('gambas2')
 conflicts=('gambas2')
 source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
-        'fix-gbi-gba-path.patch' 'gambas2-script.install'
-        'gambas2-runtime.install')
-md5sums=('f777cfe187ba58c176f90a85e33a9758'                                                                                                                                                                
+        'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
+	'gambas2-script.install' 'gambas2-runtime.install')
+md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
+         'ac9703b390502ed3242c8d34485c9236'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
          'ab5667175c4945282d2f40a35d0e9e5b')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
@@ -67,6 +68,8 @@ build() {
   ## workaround to allow package splitting
   msg "Applying patches ..."
   patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
+  # merged upstream
+  patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
   ./reconf-all
   ##
   
diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
new file mode 100644
index 000000000..0b6e68df3
--- /dev/null
+++ b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
@@ -0,0 +1,35 @@
+--- gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:01:54	3864
++++ gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:26:41	3865
+@@ -1216,7 +1216,8 @@
+         GB.StoreVariant(&fantom, &buffer[i]);
+       }
+       else{
+-        GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
++	GB_VARIANT val = res->GetData(pos,i);
++        GB.StoreVariant(&val , &buffer[i]);
+       }
+     }
+   }
+@@ -1874,6 +1875,8 @@
+   static char query[SQLMAXLEN];
+   int type;
+   std::string str1,str2;
++  GB_VARIANT varval;
++  char* charval;
+   snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
+   if (do_query(db, query, &res, "Unable to get the field from the table")){
+     delete res;
+@@ -1900,9 +1903,11 @@
+     str1=res->GetData(0,3).value.value._string;
+   if(str1!="")
+     str2=str1.assign(str1,8,str1.length()-8);
+-  GB.FreeString(&res->GetData(0,3).value.value._string);
++  charval = res->GetData(0,3).value.value._string;
++  GB.FreeString(&charval);
+   res->SetData(0,3,str2);
+-  GB.StoreVariant(&res->GetData(0,3), &info->def);
++  varval = res->GetData(0,3);
++  GB.StoreVariant(&varval, &info->def);
+   }
+   delete res;
+   return FALSE;
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index 36d912b1e..328e44a6a 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=lightspark
-pkgver=0.4.7.1
-pkgrel=3
+pkgver=0.4.8.1
+pkgrel=1
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64')
 url='http://lightspark.sourceforge.net'
@@ -12,9 +12,9 @@ conflicts=('lightspark-git')
 depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2')
 makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig')
 optdepends=('gnash-gtk: fallback support')
-install="${pkgname}.install"
-source=("http://launchpad.net/${pkgname}/trunk/${pkgname}-${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fee5cd52a8a23e858979a8f4ec778266')
+install="lightspark.install"
+source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz")
+md5sums=('296b859ea2b5c126e899e609014f2786')
 
 build() {
   rm -rf build
@@ -26,7 +26,7 @@ build() {
     -DCOMPILE_PLUGIN=1 \
     -DCMAKE_BUILD_TYPE=Release \
     -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
-    ../${pkgname}-${pkgver}
+    ../lightspark-${pkgver}
 
   make
 }
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index d45274aa7..828d91eac 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46547 2011-05-09 02:22:08Z svenstaro $
+# $Id: PKGBUILD 48032 2011-05-27 16:13:36Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu')
 makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake')
 source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('924a02881b2e7e2fc68910d41ce51d8a')
+md5sums=('90e0bdcbdfa95cb0322c04082418a56c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}/
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 64cf20044..5a43aea69 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 38970 2011-02-04 10:43:11Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 48022 2011-05-27 15:14:57Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 pkgname=nbd
-pkgver=2.9.20
+pkgver=2.9.21a
 pkgrel=1
 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP."
 arch=('i686' 'x86_64')
@@ -11,7 +12,7 @@ license=('GPL')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	nbd.conf.d nbd)
 depends=('glib2')
-md5sums=('aec35f6beb7bb4cb2ee267fe0f72c8d6'
+md5sums=('4028c77d52a13f16be5e9bf3d3bab27d'
          '6d746f377a28b92dd2c80f01176cb811'
          'ab9c431881f5e3c98a8f6c04016f0e00')
 
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 2a321f237..7b50171ae 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,13 +4,14 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.7
+pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('readline')
+#depends=('readline')
+depends=('ppl')
 makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
@@ -19,8 +20,8 @@ options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('0dc2c9e9cc593685bb039085900ddfeb'
-         'bcd01b7863794431f8f208ed96fd108d')
+md5sums=('db4d891feed487e1696b8d01ae3b6469'
+         'dc391f12b7d17dd37326343ec0e99bbd')
 
 build() {
   cd sage-${pkgver}
@@ -30,8 +31,10 @@ build() {
   # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook
   # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash
   # this is for people who have custom kernels (sage works this around by checking uname -r)
+  #mkdir -p spkg/installed
+  #touch spkg/installed/readline-6.1
   mkdir -p spkg/installed
-  touch spkg/installed/readline-6.1
+  touch spkg/installed/ppl-0.11.2
 
   # fix "missing sage.all error" during build
   unset CFLAGS
@@ -61,6 +64,9 @@ build() {
   # only build sage, no documents
   #make build
   make
+
+  # uncomment if we want to run all the tests (warning: very long)
+  #make ptestlong
 }
 
 package() {
diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop
index 87496030b..26a35d3ac 100644
--- a/community/sage-mathematics/SAGE-notebook.desktop
+++ b/community/sage-mathematics/SAGE-notebook.desktop
@@ -9,7 +9,6 @@ GenericName[de]=
 Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
 MimeType=
 Name[de]=SAGE
-Path=/opt/sage/notebook
 StartupNotify=true
 Terminal=true
 Type=Application
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
index f5c16308e..6caa5299e 100644
--- a/community/sage-mathematics/sage-mathematics.install
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -5,6 +5,9 @@ post_install() {
   # the files it writes to ~/.sage can be safely ignored
   HOME=/tmp ./sage -c
 
+  # add sagemath user for the daemon
+  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
+
   # Update LaTeX db to point to SageTeX
   if [ -f /usr/bin/texhash ]; then
     /usr/bin/texhash /usr/share/texmf
@@ -23,11 +26,14 @@ echo '
 \___/  |  |_/|/\__/  \_/|/o
             /|         /|  
             \|         \|  
- ___  __ _  __ _  ___ 
-/ __|/ _` |/ _` |/ _ \
-\__ \ (_| | (_| |  __/
-|___/\__,_|\__, |\___|
-           |___/      
+ ________________________________ 
+< sage-mathematics, I mean, MOO! >
+ -------------------------------- 
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
 '
 
 }
@@ -42,6 +48,9 @@ post_remove() {
     /usr/bin/texhash /usr/share/texmf
   fi
 
+  # remove the sagemath daemon user
+  userdel sagemath
+
   # clean up left overs
   rm -rf /opt/sage
 }
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
new file mode 100644
index 000000000..c9bc1dae8
--- /dev/null
+++ b/community/wine/PKGBUILD
@@ -0,0 +1,144 @@
+# $Id: PKGBUILD 48061 2011-05-27 19:54:08Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.3.21
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
+md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+  fontconfig      lib32-fontconfig
+  mesa            lib32-mesa 
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxxf86dga     lib32-libxxf86dga
+  alsa-lib        lib32-alsa-lib
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  giflib          lib32-giflib
+  libxpm          lib32-libxpm
+  libpng          lib32-libpng
+  libxinerama     lib32-libxinerama
+  libxcomposite   lib32-libxcomposite
+  libxmu          lib32-libxmu
+  libxxf86vm      lib32-libxxf86vm
+  libxml2         lib32-libxml2
+  libxslt         lib32-libxslt
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+  
+optdepends=(
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+else
+  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+  conflicts=('bin32-wine' 'wine-wow64')
+  replaces=('bin32-wine')
+fi
+
+build() {
+  cd "$srcdir"
+
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
+
+    mkdir $pkgname-64-build
+    cd "$srcdir/$pkgname-64-build"
+    ../$pkgname/configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --libdir=/usr/lib \
+      --with-x \
+      --enable-win64
+
+    make
+
+    _wine32opts=(
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
+
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  fi
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
+
+  make
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  if [[ $CARCH == i686 ]]; then
+    make prefix="$pkgdir/usr" install
+  else
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
+
+    msg2 "Packaging Wine-64..."
+    cd "$srcdir/$pkgname-64-build"
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
+  fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
new file mode 100644
index 000000000..f71262186
--- /dev/null
+++ b/community/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-desktop-database -q
+	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	echo "If you are on x86_64, the default WINEARCH will be win64."
+	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+	update-desktop-database -q
+}