Tue Jul 31 00:02:29 UTC 2012

4 files changed, 58 insertions, 119 deletions

diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 9a3937901..cbe9e65f0 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72043 2012-06-06 19:44:09Z lcarlier $
+# $Id: PKGBUILD 74503 2012-07-29 19:34:09Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
-pkgver=1.99.10
+pkgver=1.99.12
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
@@ -15,14 +15,14 @@ makedepends=('python2')
 source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
         chmsee)
 install=chmsee.install
-md5sums=('8d8a45f10fe68c08d2248ea1df62a697'
+md5sums=('6cce2f994867fbe8a637a129c721546b'
          '242a9390bc943cc38237fa71137fb26c')
 
 build() {
   cd ${srcdir}/jungleji-chmsee-*/src
 
   cp Makefile.arch Makefile
-  sed -i -e 's/12.*/13.*/g' ../application.ini
+  #sed -i -e 's/12.*/13.*/g' ../application.ini
 
   make
 }
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index ebe2a2b12..081942518 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $
+# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -12,7 +12,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
          'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
          'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
          'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
          'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
          'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          '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.24.0
-pkgrel=2
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
@@ -40,7 +40,8 @@ source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
 md5sums=('b59072b6f57b681d586cc84c02333690'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b')
+         'ab5667175c4945282d2f40a35d0e9e5b'
+         '5eb70afe712c0f8667a700df4d9a6735')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
 
 _buildgbcomp() {
@@ -88,7 +89,7 @@ package_gambas2-meta() {
            'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
            'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
            'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
            'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
            'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
            'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -101,6 +102,8 @@ package_gambas2-meta() {
 package_gambas2-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Gambas2 runtime environment"
+  provides=('gambas2-gb-gui')
+  conflicts=('gambas2-gb-gui')
   install=gambas2-runtime.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -116,8 +119,16 @@ package_gambas2-runtime() {
     ${pkgdir}/usr/lib/gambas2
   ln -s gbx2 ${pkgdir}/usr/bin/gbr2
   ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
 
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la}
+  rm ${pkgdir}/usr/share/gambas2/info/gb.qt*
+  
   ## needed for postinst with xdg-utils
   install -d -m755 ${pkgdir}/usr/share/gambas2/mime
   install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
@@ -192,7 +203,7 @@ package_gambas2-examples() {
            'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
            'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
            'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
            'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
            'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
            'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -200,7 +211,6 @@ package_gambas2-examples() {
            'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
            'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
   pkgdesc="Gambas2 examples"
-#  arch=('any')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
@@ -212,7 +222,6 @@ package_gambas2-examples() {
 package_gambas2-help() {
   depends=()
   pkgdesc="Gambas2 help files"
-#  arch=('any')
 
   cd ${srcdir}/${pkgbase}-${pkgver}/help
   make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
@@ -225,7 +234,6 @@ package_gambas2-script() {
   depends=('gambas2-devel')
   pkgdesc="Gambas2 scripter and server programs support"
   install=gambas2-script.install
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -259,7 +267,6 @@ package_gambas2-script() {
 package_gambas2-gb-chart() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 chart component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -332,7 +339,6 @@ package_gambas2-gb-db-firebird() {
 package_gambas2-gb-db-form() {
   depends=('gambas2-gb-db' 'gambas2-gb-form')
   pkgdesc="Gambas2 database form component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -426,9 +432,8 @@ package_gambas2-gb-desktop() {
 }
 
 package_gambas2-gb-form() {
-  depends=('gambas2-gb-gui')
+  depends=('gambas2-gb-runtime')
   pkgdesc="Gambas2 form component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -456,7 +461,6 @@ package_gambas2-gb-form() {
 package_gambas2-gb-form-dialog() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 form dialog component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -485,7 +489,6 @@ package_gambas2-gb-form-dialog() {
 package_gambas2-gb-form-mdi() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 form MDI component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -576,31 +579,6 @@ package_gambas2-gb-gtk-svg() {
   ##
 }
 
-package_gambas2-gb-gui() {
-  depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
-  pkgdesc="Gambas2 automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
 package_gambas2-gb-image() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 image processing component"
@@ -612,7 +590,6 @@ package_gambas2-gb-image() {
 package_gambas2-gb-info() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 info component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -773,7 +750,6 @@ package_gambas2-gb-qt-kde-html() {
 package_gambas2-gb-report() {
   depends=('gambas2-runtime' 'gambas2-gb-form')
   pkgdesc="Gambas2 report component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -820,7 +796,6 @@ package_gambas2-gb-sdl-sound() {
 package_gambas2-gb-settings() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 settings management component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -857,7 +832,6 @@ package_gambas2-gb-vb() {
 package_gambas2-gb-web() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 CGI component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -947,8 +921,3 @@ package_gambas2-gb-xml-xslt() {
   rm -rf ${pkgdir}/usr/bin
   ##
 }
-md5sums=('b59072b6f57b681d586cc84c02333690'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b'
-         '5eb70afe712c0f8667a700df4d9a6735')
diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD
index 069f5666a..9a08f17a3 100644
--- a/community/warsow/PKGBUILD
+++ b/community/warsow/PKGBUILD
@@ -1,87 +1,57 @@
-# $Id: PKGBUILD 64728 2012-02-18 03:09:46Z svenstaro $
+# $Id: PKGBUILD 74467 2012-07-29 03:46:52Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: Babets
 # Contributor: Vain
 
 pkgname=warsow
-pkgver=0.62
-pkgrel=3
-pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine"
+pkgver=1.0
+pkgrel=1
+pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine"
 url="http://www.warsow.net/"
 license=('GPL')
 arch=('i686' 'x86_64') 
-depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data')
-makedepends=('mesa' 'openal' 'unzip')
+depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data' 'libxrandr' 'libpng' 'libtheora')
+makedepends=('mesa' 'openal' 'imagemagick' 'gendesk')
 optdepends=('openal: for openal audio support')
-source=('warsow.desktop' 'warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \
-"http://www.zcdn.org/dl/warsow_${pkgver}_sdk.zip")
-noextract=("warsow_${pkgver}_sdk.zip")
-md5sums=('f9bf60c80820237f7097c4e50a9582cd'
-         'ec00081d81ad9802a8ca42fc2eac5498'
+source=('warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \
+        "http://funpark.warsow-esport.net/~warsow/1.0/warsow_${pkgver}_sdk.tar.gz")
+_genericname=('First person shooter')
+_comment=('Online Mulitiplayer Competitive FPS')
+md5sums=('ec00081d81ad9802a8ca42fc2eac5498'
          'f73e10c26197178df71b941b10bf83d7'
          'd7e4a69835bbcf801e58307e9d6b951e'
-         '649568447e938efded07e77cdfb3accb')
+         '35b9a8f530b51cda15c660b3a73f377e')
 
 build() {
-  unset CFLAGS
-	unset CXXFLAGS
+  cd "$srcdir"
+	gendesk -n
 
-  # Extract Game Source Code
-  unzip -o warsow_${pkgver}_sdk.zip -d $srcdir/warsow-src
-
-  # Patch Makefile to use correct program to query for system information
-  sed -i 's:openal-config:pkg-config:g' $srcdir/warsow-src/source/Makefile
-
-  # Patch Makefile to correctly pass on ld opts
-  sed -i 's:--as-needed:-Wc,--as-needed:g' $srcdir/warsow-src/source/Makefile
-
-  # Patch Sound Code to point to base openal library
-  sed -i 's:libopenal.so.0:libopenal.so:g' $srcdir/warsow-src/source/snd_openal/snd_main.c
-
-  # Patch for libjpeg8
-  sed -i 's/jpeg_mem_src/_jpeg_mem_src/g' $srcdir/warsow-src/source/ref_gl/r_image.c
-
-  # Patch AngelScript so it compiles correctly on i686
-  if [ "$CARCH" == "i686" ]; then
-      sed -i 's:CXXFLAGS = \(.*\):CXXFLAGS = -march=i686 \1:' \
-          $srcdir/warsow-src/libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-  fi
+  # This was used to fix some crashing due to alignment problems before. Has upstream
+  # finally got their shit together and we don't need them anymore?
+  #unset CFLAGS
+	#unset CXXFLAGS
 
   # Compile Warsow
-  cd $srcdir/warsow-src/source/
+  cd $srcdir/warsow_${pkgver}_sdk/source/
   make -j1
 }
 
 package() {
-  cd $srcdir/warsow-src/source/
+  cd $srcdir/warsow_${pkgver}_sdk/source/
   
   # Create Destination Directories
   install -d $pkgdir/opt/warsow/
 
   # Move Compiled Data to Destination Directory
-  cp -r $srcdir/warsow-src/source/release/* \
-      $pkgdir/opt/warsow
-
-  # Install Client Game Launcher
-  install -D -m 0755 $srcdir/warsow.launcher \
-      $pkgdir/usr/bin/warsow
-
-  # Install Server Game Launcher
-  install -D -m 0755 $srcdir/wsw-server.launcher \
-      $pkgdir/usr/bin/wsw-server
-
-  # Install WSWTV Server Launcher
-  install -D -m 0755 $srcdir/wswtv-server.launcher \
-      $pkgdir/usr/bin/wswtv-server
-
-  # Install Client Desktop Shortcut
-  install -D -m 0644 $srcdir/warsow.desktop \
-      $pkgdir/usr/share/applications/warsow.desktop
-
-  # Install Icon
-  install -D -m 0644 $srcdir/warsow-src/source/win32/warsow.ico \
-      $pkgdir/usr/share/pixmaps/warsow.ico
+  cp -r $srcdir/warsow_${pkgver}_sdk/source/release/* $pkgdir/opt/warsow
+
+  install -D -m 0755 $srcdir/warsow.launcher $pkgdir/usr/bin/warsow
+  install -D -m 0755 $srcdir/wsw-server.launcher $pkgdir/usr/bin/wsw-server
+  install -D -m 0755 $srcdir/wswtv-server.launcher $pkgdir/usr/bin/wswtv-server
+  install -D -m 0644 $srcdir/warsow.desktop $pkgdir/usr/share/applications/warsow.desktop
+  convert $srcdir/warsow_${pkgver}_sdk/source/win32/warsow.ico $srcdir/warsow.png
+  install -D -m 0644 $srcdir/warsow-0.png $pkgdir/usr/share/pixmaps/warsow.png
 }
 
 # vim: ts=2:sw=2
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index f1df3ac0a..8c4860871 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 74389 2012-07-26 08:51:55Z spupykin $
+# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.2.2
-_pkgver=3.2.2
-pkgrel=1
+pkgver=3.2.2.1
+_pkgver=3.2.2-p1
+pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
-depends=('boost-libs>=1.36')
-makedepends=('boost>=1.36' 'cmake>=2.8'
+depends=('boost-libs')
+makedepends=('boost' 'cmake>=2.8'
 	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
@@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa')
+md5sums=('d436430a4f1ae5fbcf038e645e4b5260')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}