- update version 2.0.3
* Don't use g_list_copy_deep, it isn't supported in Mint 13 * Unhide certain default mime actions from the open-with menu. * Add a shortcut to /usr/share/icons in the icon picker dialog - drop patch: nemo-2.0.1-g_list_copy_deep.patch, upstreamed OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=51
This commit is contained in:
parent
ba57187abd
commit
2391ac816d
@ -1,82 +0,0 @@
|
||||
Index: nemo-2.0.1/src/nemo-window.c
|
||||
===================================================================
|
||||
--- nemo-2.0.1.orig/src/nemo-window.c
|
||||
+++ nemo-2.0.1/src/nemo-window.c
|
||||
@@ -2344,17 +2344,58 @@ nemo_window_set_ignore_meta_zoom_level (
|
||||
window->details->ignore_meta_zoom_level = level;
|
||||
}
|
||||
|
||||
+/* FIXME:
|
||||
+ *
|
||||
+ * Remove this and just use g_list_copy_deep
|
||||
+ * when we no longer need to support GLib < 2.34
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+static GList *
|
||||
+list_copy_deep (GList *list, GCopyFunc func, gpointer user_data)
|
||||
+{
|
||||
+ GList *new_list = NULL;
|
||||
+
|
||||
+ if (list)
|
||||
+ {
|
||||
+ GList *last;
|
||||
+
|
||||
+ new_list = g_slice_new (GList);
|
||||
+ if (func)
|
||||
+ new_list->data = func (list->data, user_data);
|
||||
+ else
|
||||
+ new_list->data = list->data;
|
||||
+ new_list->prev = NULL;
|
||||
+ last = new_list;
|
||||
+ list = list->next;
|
||||
+ while (list)
|
||||
+ {
|
||||
+ last->next = g_slice_new (GList);
|
||||
+ last->next->prev = last;
|
||||
+ last = last->next;
|
||||
+ if (func)
|
||||
+ last->data = func (list->data, user_data);
|
||||
+ else
|
||||
+ last->data = list->data;
|
||||
+ list = list->next;
|
||||
+ }
|
||||
+ last->next = NULL;
|
||||
+ }
|
||||
+
|
||||
+ return new_list;
|
||||
+}
|
||||
+
|
||||
GList *
|
||||
nemo_window_get_ignore_meta_visible_columns (NemoWindow *window)
|
||||
{
|
||||
- return g_list_copy_deep (window->details->ignore_meta_visible_columns, (GCopyFunc) g_strdup, NULL);
|
||||
+ return list_copy_deep (window->details->ignore_meta_visible_columns, (GCopyFunc) g_strdup, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
nemo_window_set_ignore_meta_visible_columns (NemoWindow *window, GList *list)
|
||||
{
|
||||
GList *old = window->details->ignore_meta_visible_columns;
|
||||
- window->details->ignore_meta_visible_columns = list != NULL ? g_list_copy_deep (list, (GCopyFunc) g_strdup, NULL) :
|
||||
+ window->details->ignore_meta_visible_columns = list != NULL ? list_copy_deep (list, (GCopyFunc) g_strdup, NULL) :
|
||||
NULL;
|
||||
if (old != NULL)
|
||||
g_list_free_full (old, g_free);
|
||||
@@ -2363,14 +2404,14 @@ nemo_window_set_ignore_meta_visible_colu
|
||||
GList *
|
||||
nemo_window_get_ignore_meta_column_order (NemoWindow *window)
|
||||
{
|
||||
- return g_list_copy_deep (window->details->ignore_meta_column_order, (GCopyFunc) g_strdup, NULL);
|
||||
+ return list_copy_deep (window->details->ignore_meta_column_order, (GCopyFunc) g_strdup, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
nemo_window_set_ignore_meta_column_order (NemoWindow *window, GList *list)
|
||||
{
|
||||
GList *old = window->details->ignore_meta_column_order;
|
||||
- window->details->ignore_meta_column_order = list != NULL ? g_list_copy_deep (list, (GCopyFunc) g_strdup, NULL) :
|
||||
+ window->details->ignore_meta_column_order = list != NULL ? list_copy_deep (list, (GCopyFunc) g_strdup, NULL) :
|
||||
NULL;
|
||||
if (old != NULL)
|
||||
g_list_free_full (old, g_free);
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:79d6f19c36581c04f985bbafe2cd247658e79a8d55c18ca2234a3d72cf8b9c05
|
||||
size 1339180
|
3
nemo-2.0.3.tar.gz
Normal file
3
nemo-2.0.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ecf82d31a8fd412f03e6903bb4bda64daff9d8fe68309949cea74cdec80be223
|
||||
size 1339388
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 28 18:20:39 UTC 2013 - i@marguerite.su
|
||||
|
||||
- update version 2.0.3
|
||||
* Don't use g_list_copy_deep, it isn't supported in Mint 13
|
||||
* Unhide certain default mime actions from the open-with menu.
|
||||
* Add a shortcut to /usr/share/icons in the icon picker dialog
|
||||
- drop patch: nemo-2.0.1-g_list_copy_deep.patch, upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 21 17:44:21 UTC 2013 - i@marguerite.su
|
||||
|
||||
|
@ -18,15 +18,13 @@
|
||||
|
||||
|
||||
Name: nemo
|
||||
Version: 2.0.1
|
||||
Version: 2.0.3
|
||||
Release: 0
|
||||
License: GPL-2.0+ and LGPL-2.0
|
||||
Summary: File browser for Cinnamon
|
||||
Url: http://github.com/linuxmint/nemo
|
||||
Group: System/GUI/Other
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-OPENSUSE fix upstream g_list_copy_deep on 12.2
|
||||
Patch0: nemo-2.0.1-g_list_copy_deep.patch
|
||||
# PATCH-FIX-UPSTREAM marguerite@opensuse.org fix OBS gcc checks
|
||||
Patch1: nemo-2.0.1-view-no-return.patch
|
||||
# PATCH-FIX-UPSTREAM marguerite@opensuse.org GTK_STOCK_* is deprecated
|
||||
@ -92,7 +90,6 @@ This package provides the GObject Introspection bindings for Nemo.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%if 0%{?suse_version} > 1230
|
||||
%patch2 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user