[arch-commits] Commit in nautilus/repos (10 files)
Ionut Biru
ibiru at archlinux.org
Mon May 7 15:42:16 UTC 2012
Date: Monday, May 7, 2012 @ 11:42:16
Author: ibiru
Revision: 158697
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nautilus/repos/extra-i686/PKGBUILD
(from rev 158696, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-i686/nautilus.install
(from rev 158696, nautilus/trunk/nautilus.install)
nautilus/repos/extra-i686/samba-crash.patch
(from rev 158696, nautilus/trunk/samba-crash.patch)
nautilus/repos/extra-x86_64/PKGBUILD
(from rev 158696, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-x86_64/nautilus.install
(from rev 158696, nautilus/trunk/nautilus.install)
nautilus/repos/extra-x86_64/samba-crash.patch
(from rev 158696, nautilus/trunk/samba-crash.patch)
Deleted:
nautilus/repos/extra-i686/PKGBUILD
nautilus/repos/extra-i686/nautilus.install
nautilus/repos/extra-x86_64/PKGBUILD
nautilus/repos/extra-x86_64/nautilus.install
--------------------------------+
extra-i686/PKGBUILD | 71 ++++++++++++++++++++-------------------
extra-i686/nautilus.install | 28 +++++++--------
extra-i686/samba-crash.patch | 32 +++++++++++++++++
extra-x86_64/PKGBUILD | 71 ++++++++++++++++++++-------------------
extra-x86_64/nautilus.install | 28 +++++++--------
extra-x86_64/samba-crash.patch | 32 +++++++++++++++++
6 files changed, 166 insertions(+), 96 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-07 15:34:49 UTC (rev 158696)
+++ extra-i686/PKGBUILD 2012-05-07 15:42:16 UTC (rev 158697)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=nautilus
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-nst-extension \
- --disable-update-mimedb \
- --disable-packagekit \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: nautilus/repos/extra-i686/PKGBUILD (from rev 158696, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=nautilus
+pkgver=3.4.1
+pkgrel=2
+pkgdesc="GNOME file manager"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
+makedepends=('intltool' 'gobject-introspection')
+url="http://www.gnome.org"
+groups=('gnome')
+options=('!libtool' '!emptydirs')
+install=nautilus.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ samba-crash.patch)
+sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d'
+ 'e437ced7bbebe49d2454b4daecd10cff39d1c427e9631fe0fe5325072ed6aefd')
+
+build() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/samba-crash.patch"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/nautilus \
+ --disable-nst-extension \
+ --disable-update-mimedb \
+ --disable-packagekit \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/nautilus.install
===================================================================
--- extra-i686/nautilus.install 2012-05-07 15:34:49 UTC (rev 158696)
+++ extra-i686/nautilus.install 2012-05-07 15:42:16 UTC (rev 158697)
@@ -1,14 +0,0 @@
-post_install() {
- 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
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nautilus/repos/extra-i686/nautilus.install (from rev 158696, nautilus/trunk/nautilus.install)
===================================================================
--- extra-i686/nautilus.install (rev 0)
+++ extra-i686/nautilus.install 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,14 @@
+post_install() {
+ 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
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nautilus/repos/extra-i686/samba-crash.patch (from rev 158696, nautilus/trunk/samba-crash.patch)
===================================================================
--- extra-i686/samba-crash.patch (rev 0)
+++ extra-i686/samba-crash.patch 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,32 @@
+From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 04 May 2012 18:38:43 +0000
+Subject: places-sidebar: don't double unref GMount objects
+
+Fixes a lot of reported crashers with NFS/Samba volumes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674659
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 61f3658..672a4b0 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar)
+ root = g_mount_get_default_location (mount);
+
+ if (!g_file_is_native (root)) {
+- network_mounts = g_list_prepend (network_mounts, g_object_ref (mount));
++ network_mounts = g_list_prepend (network_mounts, mount);
+ continue;
+ }
+
+@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar)
+ name, icon, mount_uri,
+ NULL, NULL, mount, 0, tooltip);
+ g_object_unref (root);
+- g_object_unref (mount);
+ g_object_unref (icon);
+ g_free (name);
+ g_free (mount_uri);
+--
+cgit v0.9.0.2
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-07 15:34:49 UTC (rev 158696)
+++ extra-x86_64/PKGBUILD 2012-05-07 15:42:16 UTC (rev 158697)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=nautilus
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-nst-extension \
- --disable-update-mimedb \
- --disable-packagekit \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 158696, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=nautilus
+pkgver=3.4.1
+pkgrel=2
+pkgdesc="GNOME file manager"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
+makedepends=('intltool' 'gobject-introspection')
+url="http://www.gnome.org"
+groups=('gnome')
+options=('!libtool' '!emptydirs')
+install=nautilus.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ samba-crash.patch)
+sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d'
+ 'e437ced7bbebe49d2454b4daecd10cff39d1c427e9631fe0fe5325072ed6aefd')
+
+build() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/samba-crash.patch"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/nautilus \
+ --disable-nst-extension \
+ --disable-update-mimedb \
+ --disable-packagekit \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/nautilus.install
===================================================================
--- extra-x86_64/nautilus.install 2012-05-07 15:34:49 UTC (rev 158696)
+++ extra-x86_64/nautilus.install 2012-05-07 15:42:16 UTC (rev 158697)
@@ -1,14 +0,0 @@
-post_install() {
- 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
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nautilus/repos/extra-x86_64/nautilus.install (from rev 158696, nautilus/trunk/nautilus.install)
===================================================================
--- extra-x86_64/nautilus.install (rev 0)
+++ extra-x86_64/nautilus.install 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,14 @@
+post_install() {
+ 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
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nautilus/repos/extra-x86_64/samba-crash.patch (from rev 158696, nautilus/trunk/samba-crash.patch)
===================================================================
--- extra-x86_64/samba-crash.patch (rev 0)
+++ extra-x86_64/samba-crash.patch 2012-05-07 15:42:16 UTC (rev 158697)
@@ -0,0 +1,32 @@
+From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 04 May 2012 18:38:43 +0000
+Subject: places-sidebar: don't double unref GMount objects
+
+Fixes a lot of reported crashers with NFS/Samba volumes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674659
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 61f3658..672a4b0 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar)
+ root = g_mount_get_default_location (mount);
+
+ if (!g_file_is_native (root)) {
+- network_mounts = g_list_prepend (network_mounts, g_object_ref (mount));
++ network_mounts = g_list_prepend (network_mounts, mount);
+ continue;
+ }
+
+@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar)
+ name, icon, mount_uri,
+ NULL, NULL, mount, 0, tooltip);
+ g_object_unref (root);
+- g_object_unref (mount);
+ g_object_unref (icon);
+ g_free (name);
+ g_free (mount_uri);
+--
+cgit v0.9.0.2
More information about the arch-commits
mailing list