3 files changed, 66 insertions, 37 deletions
diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
index 34b72f227..799ad8d43 100644
--- a/extra/rox/PKGBUILD
+++ b/extra/rox/PKGBUILD
@@ -1,51 +1,46 @@
-# $Id: PKGBUILD 46891 2009-07-20 23:09:07Z giovanni $
+# $Id: PKGBUILD 127760 2011-06-18 07:02:05Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=rox
-_appname=${pkgname}-filer
 pkgver=2.10
-pkgrel=1
-pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels."
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://roscidus.com/desktop/"
-depends=('libxml2' 'gtk2' 'shared-mime-info' 'bash' 'libsm' 'libglade')
+depends=('sh' 'libsm' 'libglade')
 makedepends=('librsvg' 'python')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${_appname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop ${pkgname}.svg)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/rox-filer-${pkgver}.tar.bz2 \
+        rox.desktop rox.svg rox.sh right-click.diff)
 md5sums=('28e8494c9af783258ff86c830f8f0062'
          '80e7a90e9d58375b25494fbdc01a05bd'
-         '658c8648b51e215558e13e6afb2b5c76')
+         '658c8648b51e215558e13e6afb2b5c76'
+         '31578a90b241f0a8d09c9f8587608d00'
+         '2b2105a33070ac09a6352c29a5a17e4e')
 
 build() {
-  cd ${startdir}/src/${_appname}-${pkgver}/Choices
-  mkdir -p ${startdir}/pkg/usr/share/Choices
-  cp -rp MIME-types ${startdir}/pkg/usr/share/Choices/
- # manually copy the manpages first
-  cd ../
-  install -Dm 0644 rox.1 ${startdir}/pkg/usr/share/man/man1/rox.1
-  cd ${startdir}/pkg/usr/share/man/man1
-  ln -sf rox.1 ROX-Filer.1
- # this compiles and installs rox
- cd ${startdir}/src/${_appname}-${pkgver}/ROX-Filer
+  cd "${srcdir}/rox-filer-${pkgver}/ROX-Filer"
+  patch -p2 -i "${srcdir}/right-click.diff"
   ./AppRun --compile
-  cd ..
-  cp -rp ROX-Filer ${startdir}/pkg/usr/share/
-  rm -fr ${startdir}/pkg/usr/share/ROX-Filer/{src,build}
- # create a shellscript which is known in the PATH
-  mkdir -p ${startdir}/pkg/usr/bin
-  echo "#!/bin/sh" > "${startdir}/pkg/usr/bin/rox"
-  echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${startdir}/pkg/usr/bin/rox"
-  chmod a+x ${startdir}/pkg/usr/bin/rox
- # install some freedesktop.org compatibility
-  install -D -m644 ${startdir}/src/${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
-  install -D -m644 ${startdir}/src/${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg
-   # finally we render a png as fallback for not svg aware menu applications
-   # Attention: always make sure you check the dimensions of the source-svg,
-   # you can read the dimensions via inkscapes export funktion
-  rsvg -w 48 -h 38 -f png ${startdir}/src/${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png
+# 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
+  rsvg-convert -w 48 -h 38 -f png -o "${srcdir}/rox.png" "${srcdir}/rox.svg"
+}
+
+package() {
+  cd "${srcdir}/rox-filer-${pkgver}"
+  install -d "${pkgdir}/usr/share/Choices/MIME-types"
+  install -m755 Choices/MIME-types/* "${pkgdir}/usr/share/Choices/MIME-types/"
+  cp -rp ROX-Filer "${pkgdir}/usr/share/"
+  rm -fr "${pkgdir}"/usr/share/ROX-Filer/{src,build}
+ 
+  install -D -m755 "${srcdir}/rox.sh" "${pkgdir}/usr/bin/rox"
+  install -D -m644 rox.1 "${pkgdir}/usr/share/man/man1/rox.1"
+  ln -sf rox.1 "${pkgdir}/usr/share/man/man1/ROX-Filer.1"
+
+  install -D -m644 "${srcdir}/rox.desktop" "${pkgdir}/usr/share/applications/rox.desktop"
+  install -D -m644 "${srcdir}/rox.svg" "${pkgdir}/usr/share/pixmaps/rox.svg"
+  install -D -m644 "${srcdir}/rox.png" "${pkgdir}/usr/share/pixmaps/rox.png"
 }
diff --git a/extra/rox/right-click.diff b/extra/rox/right-click.diff
new file mode 100644
index 000000000..e8ad67907
--- /dev/null
+++ b/extra/rox/right-click.diff
@@ -0,0 +1,32 @@
+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.sh b/extra/rox/rox.sh
new file mode 100644
index 000000000..f2dc449d0
--- /dev/null
+++ b/extra/rox/rox.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/ROX-Filer/AppRun "$@"