Sun May 1 22:33:26 UTC 2011

4 files changed, 90 insertions, 27 deletions

diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 596167539..9ef12ad8e 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,36 +1,41 @@
-# $Id: PKGBUILD 104094 2010-12-28 19:26:26Z ibiru $
+# $Id: PKGBUILD 121317 2011-04-30 15:08:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=2.32.2.1
-pkgrel=1
+pkgver=3.0.1
+pkgrel=2
 pkgdesc="The GNOME shell and file manager"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libexif>=0.6.19' 'gnome-desktop>=2.32.1' 'exempi>=2.1.1' 'libunique>=1.1.6' 'hicolor-icon-theme' 'gvfs>=1.6.6' 'desktop-file-utils')
-makedepends=('intltool' 'gobject-introspection' 'namcap')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info')
+makedepends=('intltool' 'gobject-introspection')
 replaces=('gnome-volume-manager')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
-        nautilus-condrestart.patch)
-sha256sums=('802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303'
-            'f825292ef26274d3044272ca9f25095391cc49d30fb0056e7ed7346a1b4d106c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        places-sidebar.patch  progress-ui-handler.patch)
+sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
+            'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
+            '5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/nautilus-condrestart.patch"
+  #fixed for 3.0.2
+  patch -Np1 -i "${srcdir}/places-sidebar.patch"
+  patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \
+      --disable-nst-extension \
       --disable-update-mimedb \
-      --disable-packagekit
+      --disable-packagekit \
+      --disable-schemas-compile
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nautilus ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/nautilus/nautilus.install b/extra/nautilus/nautilus.install
index 1d818c955..631e38649 100644
--- a/extra/nautilus/nautilus.install
+++ b/extra/nautilus/nautilus.install
@@ -1,26 +1,20 @@
-pkgname=nautilus
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-mime-database usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall nautilus
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
+  post_install
 }
diff --git a/extra/nautilus/places-sidebar.patch b/extra/nautilus/places-sidebar.patch
new file mode 100644
index 000000000..e6c3f6327
--- /dev/null
+++ b/extra/nautilus/places-sidebar.patch
@@ -0,0 +1,36 @@
+From cd5a1e5cf95a165c66e7a097530058864dc3a38f Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Thu, 28 Apr 2011 18:05:07 +0000
+Subject: places-sidebar: make sure to return if we click inside empty space
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648872
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 6e49a4c..56216ab 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -2685,6 +2685,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ 	GtkTreeIter iter;
+ 	GtkTreeModel *model;
+ 	GtkTreeView *tree_view;
++	gboolean res;
+ 
+ 	path = NULL;
+ 
+@@ -2708,8 +2709,12 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ 			return FALSE;
+ 		}
+ 
+-		gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y,
+-					       &path, NULL, NULL, NULL);
++		res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y,
++						     &path, NULL, NULL, NULL);
++
++		if (!res) {
++			return FALSE;
++		}
+ 
+ 		gtk_tree_model_get_iter (model, &iter, path);
+ 
+--
+cgit v0.9
diff --git a/extra/nautilus/progress-ui-handler.patch b/extra/nautilus/progress-ui-handler.patch
new file mode 100644
index 000000000..231ea64bc
--- /dev/null
+++ b/extra/nautilus/progress-ui-handler.patch
@@ -0,0 +1,28 @@
+From fdcc2f36f549a18ea6f587fb9e9bad97f0114c59 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Thu, 28 Apr 2011 18:25:15 +0000
+Subject: progress-ui-handler: don't add progress infos to the window twice
+
+We were adding them twice in case there was already one operation
+running.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648857
+---
+diff --git a/src/nautilus-progress-ui-handler.c b/src/nautilus-progress-ui-handler.c
+index 2479682..fe295b2 100644
+--- a/src/nautilus-progress-ui-handler.c
++++ b/src/nautilus-progress-ui-handler.c
+@@ -315,10 +315,10 @@ handle_new_progress_info (NautilusProgressUIHandler *self,
+ 			  G_CALLBACK (progress_info_finished_cb), self);
+ 
+ 	self->priv->active_infos++;
+-	progress_ui_handler_add_to_window (self, info);
+ 
+ 	if (self->priv->active_infos == 1) {
+ 		/* this is the only active operation, present the window */
++		progress_ui_handler_add_to_window (self, info);
+ 		gtk_window_present (GTK_WINDOW (self->priv->progress_window));
+ 	} else {
+ 		if (gtk_widget_get_visible (self->priv->progress_window)) {
+--
+cgit v0.9