Date: Monday, April 25, 2016 @ 04:42:53 Author: faidoc Revision: 171759
upgpkg: nemo 3.0.0-1 Modified: nemo/trunk/PKGBUILD Deleted: nemo/trunk/0001-Fix-fallback-style-for-GTK-3.20.patch nemo/trunk/deep-count-one-filesystem.patch nemo/trunk/nemo-gtk-3.20-style-classes.patch --------------------------------------------+ 0001-Fix-fallback-style-for-GTK-3.20.patch | 55 ------------ PKGBUILD | 27 ------ deep-count-one-filesystem.patch | 120 --------------------------- nemo-gtk-3.20-style-classes.patch | 44 --------- 4 files changed, 4 insertions(+), 242 deletions(-) Deleted: 0001-Fix-fallback-style-for-GTK-3.20.patch =================================================================== --- 0001-Fix-fallback-style-for-GTK-3.20.patch 2016-04-25 02:38:06 UTC (rev 171758) +++ 0001-Fix-fallback-style-for-GTK-3.20.patch 2016-04-25 02:42:53 UTC (rev 171759) @@ -1,55 +0,0 @@ -From 81ac4e3e7ebc618c6c05e4a1b158a98402e72e0f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> -Date: Sun, 10 Apr 2016 17:38:02 +0200 -Subject: [PATCH] Fix fallback style for GTK 3.20 - ---- - libnemo-private/nemo-places-tree-view.c | 2 +- - src/nemo-style-fallback.css | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libnemo-private/nemo-places-tree-view.c b/libnemo-private/nemo-places-tree-view.c -index b7836e1..53775dd 100644 ---- a/libnemo-private/nemo-places-tree-view.c -+++ b/libnemo-private/nemo-places-tree-view.c -@@ -34,7 +34,7 @@ static gpointer parent_class; - static void - nemo_places_tree_view_init (NemoPlacesTreeView *tree_view) - { -- -+ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tree_view)), "places-treeview"); - } - - static void -diff --git a/src/nemo-style-fallback.css b/src/nemo-style-fallback.css -index 0e5684e..ba64a52 100644 ---- a/src/nemo-style-fallback.css -+++ b/src/nemo-style-fallback.css -@@ -1,6 +1,6 @@ - /* For Places Sidebar diskfull indicators */ - --NemoPlacesTreeView { -+.places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65); - -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0); - -NemoPlacesTreeView-disk-full-bar-width: 2px; -@@ -9,13 +9,13 @@ NemoPlacesTreeView { - -NemoPlacesTreeView-disk-full-max-length: 70px; - } - --NemoPlacesTreeView:selected { -+.places-treeview:selected { - -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0); - -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0); - } - --NemoPlacesTreeView:hover { -+.places-treeview:hover { - } - --NemoPlacesTreeView:selected:hover { -+.places-treeview:selected:hover { - } --- -2.8.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-25 02:38:06 UTC (rev 171758) +++ PKGBUILD 2016-04-25 02:42:53 UTC (rev 171759) @@ -3,8 +3,8 @@ # Contributor: Ner0 pkgname=nemo -pkgver=2.8.7 -pkgrel=4 +pkgver=3.0.0 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo"; @@ -14,14 +14,8 @@ makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib') options=('!emptydirs') install=nemo.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"; - "deep-count-one-filesystem.patch" - "0001-Fix-fallback-style-for-GTK-3.20.patch" - "nemo-gtk-3.20-style-classes.patch") -sha256sums=('21f290212bcfb4ac58f7bdc17e9dccfafb59d9fd52a7540a7e199e252a7c2fe4' - '1acd384b7e345d4e2815c51a94b4ffbb802ee376004c3db75cc871eef551cbfa' - 'cb5aa9ec771afd5380cee08e1dd17ef35b6d6502ab8c778d85e88350a30ddfc5' - 'b93d549c17ea1e30b52a7ea0a8c8b0262d0b827e96414843bdaaddce01e73bec') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver";) +sha256sums=('25da69bfb2a5864e643095c85b875bbfb97520a899671a77aeae0c812444366c') prepare() { cd linuxmint-nemo-* @@ -29,19 +23,6 @@ # Python2 fix find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - # directory: limit deep scount (folder contents and size) to one filesystem (FS#47480) - # https://github.com/linuxmint/nemo/pull/1083 - patch -Np1 -i ../deep-count-one-filesystem.patch - - # Fix fallback style for GTK 3.20 - # https://github.com/linuxmint/nemo/pull/1138 - patch -Np1 -i ../nemo-gtk-3.20-style-classes.patch - - - # Fix fallback style for GTK 3.20 - # https://github.com/linuxmint/nemo/pull/1131 - patch -Np1 -i ../0001-Fix-fallback-style-for-GTK-3.20.patch - # Rename 'Files' app name to avoid having the same as nautilus sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in } Deleted: deep-count-one-filesystem.patch =================================================================== --- deep-count-one-filesystem.patch 2016-04-25 02:38:06 UTC (rev 171758) +++ deep-count-one-filesystem.patch 2016-04-25 02:42:53 UTC (rev 171759) @@ -1,120 +0,0 @@ -From fe1f9cd21b521a5f2a89aa6be105fb1af86406b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> -Date: Sun, 31 Jan 2016 07:56:28 +0100 -Subject: [PATCH] directory: limit deep scount (folder contents and size) to - one filesystem When getting the size of the root directory, nemo was - descending into other filesystems including /proc, causing it to report - nonsensical sizes. Store the fsid of the starting directory, and do not - recurse into other mount points. - -https://bugzilla.gnome.org/show_bug.cgi?id=629394 -https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/585472 - -Based on Nautilus commit: -https://git.gnome.org/browse/nautilus/commit/?id=a645da5f1043c59203fd194fe85b6976d75d2ece - -Original author: Phillip Susi <[email protected]> - -Fixes issue #1050. ---- - libnemo-private/nemo-directory-async.c | 45 ++++++++++++++++++++++++++++++---- - 1 file changed, 40 insertions(+), 5 deletions(-) - -diff --git a/libnemo-private/nemo-directory-async.c b/libnemo-private/nemo-directory-async.c -index 856ab0f..14c7026 100644 ---- a/libnemo-private/nemo-directory-async.c -+++ b/libnemo-private/nemo-directory-async.c -@@ -134,6 +134,7 @@ struct DeepCountState { - GFile *deep_count_location; - GList *deep_count_subdirectories; - GArray *seen_deep_count_inodes; -+ char *fs_id; - }; - - -@@ -2666,6 +2667,7 @@ deep_count_one (DeepCountState *state, - NemoFile *file; - GFile *subdir; - gboolean is_seen_inode; -+ const char *id; - gboolean hidden; - is_seen_inode = seen_inode (state, info); - if (!is_seen_inode) { -@@ -2684,10 +2686,13 @@ deep_count_one (DeepCountState *state, - file->details->deep_directory_count += 1; - } - /* Record the fact that we have to descend into this directory. */ -- -- subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info)); -- state->deep_count_subdirectories = g_list_prepend -- (state->deep_count_subdirectories, subdir); -+ id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM); -+ if (g_strcmp0 (id, state->fs_id) == 0) { -+ /* only if it is on the same filesystem */ -+ subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info)); -+ state->deep_count_subdirectories = g_list_prepend -+ (state->deep_count_subdirectories, subdir); -+ } - } else { - /* Even non-regular files count as files. */ - if (hidden) { -@@ -2719,6 +2724,7 @@ deep_count_state_free (DeepCountState *state) - } - g_list_free_full (state->deep_count_subdirectories, g_object_unref); - g_array_free (state->seen_deep_count_inodes, TRUE); -+ g_free (state->fs_id); - g_free (state); - } - -@@ -2865,6 +2871,7 @@ deep_count_load (DeepCountState *state, GFile *location) - G_FILE_ATTRIBUTE_STANDARD_SIZE "," - G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "," - G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "," -+ G_FILE_ATTRIBUTE_ID_FILESYSTEM "," - G_FILE_ATTRIBUTE_UNIX_INODE, - G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, /* flags */ - G_PRIORITY_LOW, /* prio */ -@@ -2896,6 +2903,27 @@ deep_count_stop (NemoDirectory *directory) - } - - static void -+deep_count_got_info (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ GFileInfo *info; -+ const char *id; -+ GFile *file = (GFile *)source_object; -+ DeepCountState *state = (DeepCountState *)user_data; -+ -+ info = g_file_query_info_finish (file, -+ res, -+ NULL); -+ if (info) { -+ id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM); -+ state->fs_id = g_strdup (id); -+ g_object_unref (info); -+ } -+ deep_count_load (state, file); -+} -+ -+static void - deep_count_start (NemoDirectory *directory, - NemoFile *file, - gboolean *doing_io) -@@ -2943,7 +2971,14 @@ deep_count_start (NemoDirectory *directory, - directory->details->deep_count_in_progress = state; - - location = nemo_file_get_location (file); -- deep_count_load (state, location); -+ state->fs_id = NULL; -+ g_file_query_info_async (location, -+ G_FILE_ATTRIBUTE_ID_FILESYSTEM, -+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, -+ G_PRIORITY_DEFAULT, -+ NULL, -+ deep_count_got_info, -+ state); - g_object_unref (location); - } - Deleted: nemo-gtk-3.20-style-classes.patch =================================================================== --- nemo-gtk-3.20-style-classes.patch 2016-04-25 02:38:06 UTC (rev 171758) +++ nemo-gtk-3.20-style-classes.patch 2016-04-25 02:42:53 UTC (rev 171759) @@ -1,44 +0,0 @@ -diff --git a/src/nemo-window.c b/src/nemo-window.c ---- a/src/nemo-window.c 2015-11-27 11:00:22.000000000 +0100 -+++ b/src/nemo-window.c 2016-02-13 22:13:11.907508549 +0100 -@@ -2066,6 +2066,11 @@ nemo_window_init (NemoWindow *window) - - window->details = G_TYPE_INSTANCE_GET_PRIVATE (window, NEMO_TYPE_WINDOW, NemoWindowDetails); - -+ GtkStyleContext *context; -+ -+ context = gtk_widget_get_style_context (GTK_WIDGET (window)); -+ gtk_style_context_add_class (context, "nemo-window"); -+ - window->details->panes = NULL; - window->details->active_pane = NULL; - -diff --git a/src/nemo-window-pane.c b/src/nemo-window-pane.c ---- a/src/nemo-window-pane.c 2015-11-27 11:00:22.000000000 +0100 -+++ b/src/nemo-window-pane.c 2016-02-13 22:35:49.996213630 +0100 -@@ -983,6 +983,11 @@ nemo_window_pane_init (NemoWindowPane *p - pane->active_slot = NULL; - - gtk_orientable_set_orientation (GTK_ORIENTABLE (pane), GTK_ORIENTATION_VERTICAL); -+ -+ GtkStyleContext *context; -+ -+ context = gtk_widget_get_style_context (GTK_WIDGET (pane)); -+ gtk_style_context_add_class (context, "nemo-window-pane"); - } - - NemoWindowPane * - -diff --git a/src/nemo-file-management-properties.glade b/src/nemo-file-management-properties.glade ---- a/src/nemo-file-management-properties.glade 2015-11-27 11:00:22.000000000 +0100 -+++ b/src/nemo-file-management-properties.glade 2016-02-17 09:05:07.491011645 +0100 -@@ -253,6 +253,9 @@ - <property name="window_position">center</property> - <property name="default_width">800</property> - <property name="default_height">600</property> -+ <style> -+ <class name="nemo-properties-dialog"/> -+ </style> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> \ No newline at end of file
