Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 16 insertions, 53 deletions

diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
index 96dd4393f..30d4e3554 100644
--- a/extra/rox/PKGBUILD
+++ b/extra/rox/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 127760 2011-06-18 07:02:05Z eric $
+# $Id: PKGBUILD 140263 2011-10-11 07:46:57Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=rox
-pkgver=2.10
-pkgrel=2
-pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels."
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
+pkgver=2.11
+pkgrel=1
+pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
 url="http://roscidus.com/desktop/"
-depends=('sh' 'libsm' 'libglade')
-makedepends=('librsvg' 'python')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/rox-filer-${pkgver}.tar.bz2 \
-        rox.desktop rox.svg rox.sh right-click.diff)
-md5sums=('28e8494c9af783258ff86c830f8f0062'
-         '80e7a90e9d58375b25494fbdc01a05bd'
+depends=('sh' 'libsm' 'gtk2')
+makedepends=('librsvg' 'python2')
+source=("http://downloads.sourceforge.net/${pkgname}/rox-filer-${pkgver}.tar.bz2"
+        'rox.desktop' 'rox.svg' 'rox.sh')
+md5sums=('0eebf05a67f7932367750ebf9faf215d'
+         'de05c906395abd4402b0470c1bc2ae6e'
          '658c8648b51e215558e13e6afb2b5c76'
-         '31578a90b241f0a8d09c9f8587608d00'
-         '2b2105a33070ac09a6352c29a5a17e4e')
+         '31578a90b241f0a8d09c9f8587608d00')
 
 build() {
-  cd "${srcdir}/rox-filer-${pkgver}/ROX-Filer"
-  patch -p2 -i "${srcdir}/right-click.diff"
-  ./AppRun --compile
+  cd "${srcdir}/rox-filer-${pkgver}"
+  ./ROX-Filer/AppRun --compile
 # finally we render a png as fallback for svg unaware menu applications
 # Attention: always make sure you check the dimensions of the source-svg,
 # you can read the dimensions via inkscape's export function
diff --git a/extra/rox/right-click.diff b/extra/rox/right-click.diff
deleted file mode 100644
index e8ad67907..000000000
--- a/extra/rox/right-click.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From c2232d5075342347a8ff814ced5ce8b9e1cf64b9 Mon Sep 17 00:00:00 2001
-From: Thomas Leonard <talex5@gmail.com>
-Date: Wed, 7 Apr 2010 15:44:57 +0100
-Subject: [PATCH] Bugfix: unselect item when menu is closed
-
-We used to listen for "unmap_event", but this is no longer emitted in recent
-versions of GTK. Switched to using "selection-done" instead.
-
-Closes #2925212 (reported by Barry Kauler).
----
- ROX-Filer/src/menu.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c
-index 611918d..bf4bae3 100644
---- a/ROX-Filer/src/menu.c
-+++ b/ROX-Filer/src/menu.c
-@@ -322,9 +322,9 @@ gboolean ensure_filer_menu(void)
- 	GET_SSMENU_ITEM(item, "filer", "Window", "New Window");
- 	filer_new_window = GTK_BIN(item)->child;
- 
--	g_signal_connect(filer_menu, "unmap_event",
-+	g_signal_connect(filer_menu, "selection-done",
- 			G_CALLBACK(menu_closed), NULL);
--	g_signal_connect(filer_file_menu, "unmap_event",
-+	g_signal_connect(filer_file_menu, "selection-done",
- 			G_CALLBACK(menu_closed), NULL);
- 
- 	g_signal_connect(filer_keys, "accel_changed",
--- 
-1.6.5.GIT
-
diff --git a/extra/rox/rox.desktop b/extra/rox/rox.desktop
index b1a2014f7..93edfabcf 100644
--- a/extra/rox/rox.desktop
+++ b/extra/rox/rox.desktop
@@ -1,10 +1,7 @@
 [Desktop Entry]
 Name=ROX Filer
-Comment=ROX Filer
 Exec=rox
 Icon=rox
 Terminal=false
-MultipleArgs=false
 Type=Application
-Categories=Application;FileManager;
-
+Categories=System;Utility;Core;FileManager;