Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

3 files changed, 694 insertions, 105 deletions

diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index d3b3e70f7..f0b37e7ff 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $
+# $Id: PKGBUILD 85475 2013-03-01 23:01:35Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
+pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart'
          'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form'
          'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime'
-         'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'  'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu'
-         'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext'
-         'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings'
-         'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
-         'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.3.4
+         'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
+         'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
+         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map'
+         'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'
+         'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option'
+         'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
+         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
+         'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
+pkgver=3.4.0
 pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,20 +30,18 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
 	 'gmime' 'glu')
 options=('!emptydirs')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch'
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ec3971de80901737dcc614059f441848'
-         '85b6b02bccd022bf0879fcbf21e83567'
-         'b284be39d147ec799f1116a6abc068b4'
-         '6d9e080b66443e7246387b1716d24e31')
+        fix-xfce4-terminal.patch
+        uninstall-with-XDG_UTILS.patch)
+md5sums=('e9d63bfaf351fc7e1705d1b80785b6af'
+         '543ffb3402485e0bcfc67ecf15b7b682'
+         'abf7d298d301aef65ecc4d9a775ebd00')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # Fix build with LLVM 3.2
-  patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
-  # replace obsolete AM_CONFIG_HEADER
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4
+  # merged upstream
+  patch -Np1 -i ../uninstall-with-XDG_UTILS.patch
+  patch -Np0 -i ../fix-xfce4-terminal.patch
 
   ./reconf-all
   ./configure --prefix=/usr -C
@@ -95,12 +93,21 @@ package_gambas3-runtime() {
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
   make DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/control
   ##  
 }
 
@@ -153,15 +160,15 @@ package_gambas3-script() {
 }
 
 package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt'
-           'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
+  depends=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress'
+           'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 
+           'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 
+           'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
+           'gambas3-gb-image-io' 'gambas3-gb-map' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 
            'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf'
-           'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl'
+           'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 
            'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml'
-           'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
+           'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
   pkgdesc="Applications examples"
 
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -171,6 +178,26 @@ package_gambas3-examples() {
   rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
 }
 
+package_gambas3-gb-args() {
+  depends=('gambas3-runtime')
+  pkgdesc="Command-line options analyzer component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-w]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-w]*
+  ##
+}
+
 package_gambas3-gb-cairo() {
   depends=('gambas3-runtime' 'cairo')
   pkgdesc="Cairo component"
@@ -209,8 +236,8 @@ package_gambas3-gb-chart() {
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a*,d-w]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a*,d-w]*
   ##
 }
 
@@ -296,8 +323,8 @@ package_gambas3-gb-db() {
 
   ## Workaround for splitting
   rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-c]*,gb.d{a,e,r}*,gb.[e-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-c]*,gb.d{a,e}*,gb.[e-z]*}
   ##
 }
 
@@ -321,8 +348,8 @@ package_gambas3-gb-db-form() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-c]*,[e-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-c]*,[e-z]*}
   ##
 }
 
@@ -416,6 +443,24 @@ package_gambas3-gb-db-sqlite3() {
   ##
 }
 
+package_gambas3-gb-dbus() {
+  depends=('gambas3-runtime' 'dbus-core')
+  pkgdesc="DBUS component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
+  make -j1 DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
 package_gambas3-gb-desktop() {
   depends=('gambas3-gb-image' 'libsm' 'libxtst')
   pkgdesc="Desktop component"
@@ -462,24 +507,6 @@ package_gambas3-gb-desktop-gnome() {
   ##
 }
 
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
 package_gambas3-gb-eval-highlight() {
   depends=('gambas3-runtime')
   pkgdesc="Expression evaluator highlight component"
@@ -499,8 +526,8 @@ package_gambas3-gb-eval-highlight() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-d]*,[f-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-d]*,[f-z]*}
   rm -r ${pkgdir}/usr/share/gambas3/control
   ##
 }
@@ -529,8 +556,8 @@ package_gambas3-gb-form() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}}
   ##
 }
 
@@ -558,8 +585,8 @@ package_gambas3-gb-form-dialog() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,g*,m*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,m*,s*}}
   ##
 }
 
@@ -587,8 +614,8 @@ package_gambas3-gb-form-mdi() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,d*,g*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,d*,s*}}
   ##
 }
 
@@ -611,27 +638,22 @@ package_gambas3-gb-form-stock() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
-  # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]*
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,[m-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,[m-w]*}
   ##
 }
 
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
+package_gambas3-gb-gsl() {
+  depends=('gambas3-runtime' 'gsl')
+  pkgdesc="The GNU Scientific Library component"
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
 
   ## cleanup the workaround
   cd ${srcdir}/${pkgbase}-${pkgver}/main
@@ -639,17 +661,20 @@ package_gambas3-gb-gtk() {
   ##
 }
 
-package_gambas3-gb-gtk-opengl() {
-  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
-  pkgdesc="GTK+ toolkit OpenGL component"
+package_gambas3-gb-gtk() {
+  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
+  pkgdesc="GTK+ toolkit component"
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
 
   ## cleanup the workaround
   cd ${srcdir}/${pkgbase}-${pkgver}/main
@@ -657,16 +682,16 @@ package_gambas3-gb-gtk-opengl() {
   ##
 }
 
-package_gambas3-gb-gsl() {
-  depends=('gambas3-runtime' 'gsl')
-  pkgdesc="The GNU Scientific Library component"
+package_gambas3-gb-gtk-opengl() {
+  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
+  pkgdesc="GTK+ toolkit OpenGL component"
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
   make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
@@ -779,6 +804,47 @@ package_gambas3-gb-libxml() {
   ##
 }
 
+package_gambas3-gb-map() {
+  depends=('gambas3-gb-image-io' 'gambas3-gb-form')
+  pkgdesc="Display maps component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make -j1 DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/control/gb.{[d-f]*,[q-r]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*}
+  ##
+}
+
 package_gambas3-gb-media() {
   depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
   pkgdesc="Simplified interface to the GStreamer library component"
@@ -797,6 +863,39 @@ package_gambas3-gb-media() {
   ##
 }
 
+package_gambas3-gb-memcached() {
+  depends=('gambas3-gb-net')
+  pkgdesc="Memcached client component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/control
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*}
+  ##
+}
+
 package_gambas3-gb-mime() {
   depends=('gambas3-runtime' 'gmime')
   pkgdesc="MIME message component"
@@ -892,8 +991,8 @@ package_gambas3-gb-net-pop3() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*}
   ##
 }
 
@@ -1026,7 +1125,7 @@ package_gambas3-gb-pdf() {
 }
 
 package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
+  depends=('gambas3-gb-image' 'qt4')
   pkgdesc="Qt4 toolkit component"
 
   ## workaround for splitting
@@ -1123,8 +1222,8 @@ package_gambas3-gb-report() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*}
   ##
 }
 
@@ -1179,8 +1278,8 @@ package_gambas3-gb-settings() {
   ## Workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-r]*,[t-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-r]*,[t-w]*}
   ##
 }
 
@@ -1234,6 +1333,26 @@ package_gambas3-gb-vb() {
   ##
 }
 
+package_gambas3-gb-web() {
+  depends=('gambas3-runtime')
+  pkgdesc="CGI component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make -j1 DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-v]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-v]*
+  ##
+}
+
 package_gambas3-gb-xml() {
   depends=('gambas3-runtime' 'gcc-libs')
   pkgdesc="XML component"
@@ -1328,22 +1447,3 @@ package_gambas3-gb-xml-xslt() {
   ##
 }
 
-package_gambas3-gb-web() {
-  depends=('gambas3-runtime')
-  pkgdesc="CGI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community/gambas3/fix-xfce4-terminal.patch b/community/gambas3/fix-xfce4-terminal.patch
new file mode 100644
index 000000000..c8fcc8f4f
--- /dev/null
+++ b/community/gambas3/fix-xfce4-terminal.patch
@@ -0,0 +1,476 @@
+--- gb.desktop/src/gb.desktop/.src/Desktop.class	(révision 5536)
++++ gb.desktop/src/gb.desktop/.src/Desktop.class	(révision 5537)
+@@ -1,6 +1,6 @@
+ ' Gambas class file
+ 
+-Export 
++Export
+ 
+ Class _Desktop
+ 
+@@ -27,64 +27,64 @@
+ Static Private $aImgExt As String[]
+ 
+ Static Public Sub SendMail({To} As String[], Optional Cc As String[], Optional Bcc As String[], Optional Subject As String, Optional Body As String, Optional Attachment As String)
+-  
++
+   Dim aArg As String[]
+   'xdg-email [--utf8] [--cc address] [--bcc address] [--subject text] [--body text
+   ' ] [--attach file] { mailto-uri | address(es) }
+-  
++
+   aArg = ["--utf8"]
+-  If CC And If CC.Count Then 
++  If CC And If CC.Count Then
+     aArg.Add("--cc")
+     aArg.Insert(CC)
+   Endif
+-  If BCC And If BCC.Count Then 
++  If BCC And If BCC.Count Then
+     aArg.Add("--bcc")
+     aArg.Insert(BCC)
+   Endif
+-  If Subject Then 
++  If Subject Then
+     aArg.Add("--subject")
+     aArg.Add(Subject)
+-  Endif 
+-  If Body Then 
++  Endif
++  If Body Then
+     aArg.Add("--body")
+     aArg.Add(Body)
+   Endif
+-  If Attachment Then 
++  If Attachment Then
+     aArg.Add("--attach")
+     aArg.Add(Attachment)
+-  Endif 
+-  
+-  If {To} And If To.Count Then 
++  Endif
++
++  If {To} And If To.Count Then
+     aArg.Insert({To})
+   Endif
+-  
++
+   Main.RunXdgUtil("xdg-email", aArg)
+-  
++
+ End
+ 
+ Static Public Sub {Open}(URL As String, Optional {Wait} As Boolean)
+-  
++
+   If URL = "~" Then
+     URL = User.Home
+   Else If URL Begins "~/" Then
+     URL = User.Home & Mid$(URL, 2)
+   Endif
+-  
++
+   Main.RunXdgUtil("xdg-open", [URL], {Wait})
+-  
++
+ End
+ 
+ ' Static Private Function Menus_Read() As _DesktopMenus
+-' 
+-'   Return _DesktopMenus  
+-' 
++'
++'   Return _DesktopMenus
++'
+ ' End
+-' 
+-' 
++'
++'
+ ' Static Private Function Icons_Read() As _DesktopIcons
+-' 
++'
+ '   Return _DesktopIcons
+-' 
++'
+ ' End
+ 
+ Static Private Function ScreenSaver_Read() As _Desktop_ScreenSaver
+@@ -96,20 +96,20 @@
+ '  GB_STATIC_METHOD("Find", "Integer[]", CDESKTOP_find, "[(Title)s(Application)s(Role)s]"),
+ 
+ Static Public Sub FindWindow(Optional Title As String, Application As String, Role As String) As Integer[]
+-  
++
+   Return _Desktop.FindWindow(Title, Application, Role)
+-  
++
+ End
+ 
+ ' STATIC PRIVATE SUB InitKeys()
+-'   
++'
+ '   $cKeys = NEW Collection
+ '   $cKeys["é"] = "eacute"
+-'   
++'
+ ' END
+ 
+ Static Public Sub SendKeys(Keys As String)
+-  
++
+   Dim iInd As Integer
+   Dim sCar As String
+   Dim iPos As Integer
+@@ -117,15 +117,15 @@
+   Dim bHold As Boolean
+   Dim sErr As String
+   Dim iLen As Integer = String.Len(Keys)
+-  
++
+   Do
+-  
++
+     Inc iInd
+     If iInd > iLen Then Break
+-    
++
+     sCar = String.Mid$(Keys, iInd, 1)
+-    
+-    If sCar = "[" Then 
++
++    If sCar = "[" Then
+       iPos = String.InStr(Keys, "]", iInd)
+       If iPos = 0 Then Break
+       sCar = String.Mid$(Keys, iInd + 1, iPos - iInd - 1)
+@@ -134,7 +134,7 @@
+     Else If sCar = "{" And If Not bHold Then
+       bHold = True
+       Continue
+-    Else If sCar = "}" And If bHold Then 
++    Else If sCar = "}" And If bHold Then
+       bHold = False
+       aRelease.Reverse
+       For Each sCar In aRelease
+@@ -144,11 +144,11 @@
+       aRelease.Clear
+       Continue
+     Endif
+-    
+-    If Len(sCar) >= 2 Then 
++
++    If Len(sCar) >= 2 Then
+       Try sCar = Conv(sCar, "UTF-8", "LATIN1")
+     Endif
+-    
++
+     If bHold Then
+       'DEBUG sCar;; TRUE
+       _Desktop.SendKey(sCar, True)
+@@ -159,25 +159,25 @@
+       'DEBUG sCar;; FALSE
+       _Desktop.SendKey(sCar, False)
+     Endif
+-    
+-  Loop 
+-  
+-Catch 
+ 
++  Loop
++
++Catch
++
+   sErr = Error.Text & ": '" & sCar & "'"
+-  
++
+   For Each sCar In aRelease
+     _Desktop.SendKey(sCar, False)
+   Next
+ 
+   Error.Raise(sErr)
+-  
++
+ End
+ 
+ Static Private Sub GetDesktop() As String
+-  
++
+   If Not $sDesktop Then
+-    
++
+     If Application.Env["KDE_FULL_SESSION"] Then
+       If Application.Env["KDE_SESSION_VERSION"] = "4" Then
+         $sDesktop = "KDE4"
+@@ -204,24 +204,23 @@
+           $sDesktop = "?"
+       End Select
+     Endif
+-    
++
+   Endif
+-  
++
+   '$sDesktop = "GNOME"
+   Return $sDesktop
+-  
++
+ End
+ 
++Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String)
+ 
+-Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String)
+-  
+   Dim sExec As String
+   Dim sCmd As String
+   Dim bNoDir As Boolean
+   Dim Command As String
+-  
++
+   Select Case GetDesktop()
+-  
++
+     Case "KDE"
+       sExec = "konsole"
+     Case "KDE4"
+@@ -247,7 +246,7 @@
+       Endif
+       If Command Then sExec &= " -x " & Shell$(Command)
+     Case "XFCE"
+-      sExec = "Terminal"
++      sExec = "xfce4-terminal"
+       If Command Then sExec &= " -x " & Shell$(Command)
+     Case "LXDE"
+       sExec = "lxterminal"
+@@ -255,46 +254,43 @@
+     Case Else
+       sExec = "xterm"
+       If Command Then sExec &= " -e " & Shell$(Command)
+-  
++
+   End Select
+-  
++
+   If {Dir} And If Not bNoDir Then
+     sCmd = "(cd " & Shell$({Dir}) & "; " & sExec & ")"
+   Else
+     sCmd = sExec
+   Endif
+-  
++
+   Shell sCmd
+-  
++
+ End
+ 
+-
+ Static Private Function Type_Read() As String
+ 
+-  Return GetDesktop()  
++  Return GetDesktop()
+ 
+ End
+ 
+-
+ Static Public Sub _get(Index As Integer) As _DesktopVirtual
+ 
+   Dim hVirtual As _DesktopVirtual
+-  
++
+   If Not $cDesktop Then $cDesktop = New Collection
+-  
++
+   hVirtual = $cDesktop[Index]
+   If Not hVirtual Then
+     hVirtual = New _DesktopVirtual(Index)
+     $cDesktop[Index] = hVirtual
+   Endif
+   Return hVirtual
+-  
++
+ End
+ 
+-
+ Static Private Function Current_Read() As Integer
+ 
+-  Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0]  
++  Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0]
+ 
+ End
+ 
+@@ -313,7 +309,7 @@
+ 
+ Static Private Sub Count_Write(Value As Integer)
+ 
+-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value])  
++  _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value])
+ 
+ End
+ 
+@@ -343,40 +339,40 @@
+ 
+ Static Private Sub Showing_Write(Value As Boolean)
+ 
+-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)])  
++  _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)])
+ 
+ End
+ 
+ ' Static Private Function Width_Read() As Integer
+-' 
++'
+ '   Dim iWidth As Integer
+-'   
++'
+ '   Try iWidth = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0]
+ '   If iWidth = 0 Then iWidth = Super.Width
+ '   Return iWidth
+-' 
++'
+ ' End
+-' 
++'
+ ' Static Private Function Height_Read() As Integer
+-' 
++'
+ '   Dim iHeight As Integer
+-' 
++'
+ '   Try iHeight = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1]
+ '   If iHeight = 0 Then iHeight = Super.Height
+ '   Return iHeight
+-' 
++'
+ ' End
+ 
+ ' Static Private Function W_Read() As Integer
+-' 
++'
+ '   Return Width_Read()
+-' 
++'
+ ' End
+-' 
++'
+ ' Static Private Function H_Read() As Integer
+-' 
++'
+ '   Return Height_Read()
+-' 
++'
+ ' End
+ 
+ Static Private Function Passwords_Read() As _Desktop_Passwords
+@@ -385,7 +381,6 @@
+ 
+ End
+ 
+-
+ Static Private Function Path_Read() As String
+ 
+   Return Main.GetDesktopPath()
+@@ -399,34 +394,33 @@
+ End
+ 
+ Static Public Sub RunAsRoot(Command As String)
+-  
++
+   Main.RunXdgUtil("xdg-su", ["-c", Command])
+-  
+ 
+ End
+ 
+ Static Public Sub GetFileIcon(Path As String, Size As Integer, Optional Preview As Boolean) As Picture
+-  
++
+   Dim hImage As Image
+   Dim hIcon As Image
+   Dim sIcon As String
+   Dim hPict As Picture
+-  
++
+   If IsDir(Path) Then Return Picture["icon:/" & CStr(Size) & "/directory"]
+-  
++
+   If Preview And If $aImgExt.Exist(File.Ext(Path)) < 0 Then
+-    If Stat(Path).Size <= 65536 Then 
+-    
++    If Stat(Path).Size <= 65536 Then
++
+       Try hImage = Image.Load(Path)
+       If Not Error Then
+-        If Not (hImage.Width = Size And hImage.Height = Size) Then 
+-          If hImage.Width > hImage.Height Then 
++        If Not (hImage.Width = Size And hImage.Height = Size) Then
++          If hImage.Width > hImage.Height Then
+             hImage = hImage.Stretch(Size, (Size * hImage.Height) \ hImage.Width)
+           Else
+             hImage = hImage.Stretch((Size * hImage.Width) \ hImage.Height, Size)
+           Endif
+         Endif
+-        
++
+         hIcon = New Image(hImage.W + 4, hImage.H + 4, Color.Transparent)
+         Paint.Begin(hIcon)
+         Paint.AntiAlias = False
+@@ -435,38 +429,38 @@
+         Paint.Stroke
+         Paint.End
+         hIcon.DrawImage(hImage, 2, 2)
+-        
++
+         Return hIcon.Picture
+       Else
+-        Return Picture["icon:/" & Size & "/image"]  
++        Return Picture["icon:/" & Size & "/image"]
+       Endif
+-    
++
+     Endif
+-    
++
+   Endif
+ 
+   Try hPict = DesktopMime.FromFile(Path).GetIcon(Size).Picture
+   If hPict Then Return hPict
+-    
++
+   If Not $cExt Then InitFileExt
+-  
++
+   Try sIcon = $cExt[File.Ext(Path)]
+   If sIcon Then Return Picture["icon:/" & CStr(Size) &/ sIcon]
+-    
++
+   With Stat(Path)
+-    
++
+     If InStr(.Perm[System.User.Name], "x") Then Return Picture["icon:/" & CStr(Size) &/ "exec"]
+-    
++
+   End With
+-  
++
+ Catch
+-  
++
+   Error "gb.desktop: unable to get icon for file: "; File.Name(Path)
+-  
++
+ End
+ 
+ Static Private Sub InitFileExt()
+-  
++
+   $cExt = New Collection
+   $cExt["html"] = "html"
+   $cExt["htm"] = "html"
+@@ -502,7 +496,7 @@
+   $cExt["ico"] = "image"
+   $cExt["xcf"] = "image"
+   $cExt["svg"] = "image"
+-  
++
+   $aImgExt = ["png", "jpeg", "jpg", "gif", "xpm", "bmp", "ico"]
+-  
++
+ End
diff --git a/community/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch
new file mode 100644
index 000000000..0b7b9b8d7
--- /dev/null
+++ b/community/gambas3/uninstall-with-XDG_UTILS.patch
@@ -0,0 +1,13 @@
+diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am
+--- gambas3-3.4.0/main/Makefile.am	2013-02-03 19:20:59.000000000 +0000
++++ gambas3-3.4.0b/main/Makefile.am	2013-02-21 15:28:16.941250567 +0000
+@@ -27,5 +27,7 @@
+ uninstall-local:
+ 	@rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION)
+ 	@rm -rf $(DESTDIR)$(gblibdir)/info
+-	@xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml;
+-	@xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3;
++	@if test x"$(XDG_UTILS)" != x; then \
++		xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \
++		xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \
++	fi