Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=881f5472c77625b1c1d9cc866b4892f2ac88260c
commit 881f5472c77625b1c1d9cc866b4892f2ac88260c Author: Baste <[email protected]> Date: Thu Nov 13 08:39:07 2014 +0100 nautilus-3.14.1-1-x86_64 - 3.14.0 -> 3.14.1 diff --git a/source/gnome/nautilus/FrugalBuild b/source/gnome/nautilus/FrugalBuild index 0077476..0e971df 100644 --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@ -5,8 +5,8 @@ options+=('asneeded') pkgname=nautilus -pkgver=3.14.0 -pkgrel=2 +pkgver=3.14.1 +pkgrel=1 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'librsvg>=2.26.2-2' 'libexif' 'eject' \ @@ -27,9 +27,7 @@ _F_gnome_devel="n" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet Fconfopts+=" --disable-packagekit --disable-nst-extension" -source=($source nautilus.patch) -sha1sums=('fe31cfc89f40f680d21ff04a98d4b8dc14c39002' \ - '66ece8ba49d141e2d87a5500c4c8ad1ef4d900ff') +sha1sums=('bc22f1812691269b7a8772686800d564d446c6e9') replaces=('eel' 'nautilus-wallpaper' 'nautilus-sendto' 'file-browser-applet' 'nautilus-image-converter') conflicts=('nautilus-sendto') diff --git a/source/gnome/nautilus/nautilus.patch b/source/gnome/nautilus/nautilus.patch deleted file mode 100644 index 97e4338..0000000 --- a/source/gnome/nautilus/nautilus.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/nautilus-application.c -+++ src/nautilus-application-hack.c -@@ -844,16 +844,20 @@ - - g_variant_dict_lookup (options, G_OPTION_REMAINING, "^a&s", &remaining); - -- if (remaining == NULL) { -- return -1; -- } -- - /* Convert args to GFiles */ - file_array = g_ptr_array_new_full (0, g_object_unref); - -- for (idx = 0; remaining[idx] != NULL; idx++) { -- file = g_file_new_for_commandline_arg (remaining[idx]); -+ if (remaining) { -+ for (idx = 0; remaining[idx] != NULL; idx++) { -+ file = g_file_new_for_commandline_arg (remaining[idx]); -+ g_ptr_array_add (file_array, file); -+ } -+ } else if (g_variant_dict_contains (options, "new-window")) { -+ file = g_file_new_for_path (g_get_home_dir ()); - g_ptr_array_add (file_array, file); -+ } else { -+ /* No options or options that glib already manages */ -+ return -1; - } - - len = file_array->len; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
