diff --git a/nemo-2.0.1-GTK_STOCK.patch b/nemo-2.0.1-GTK_STOCK.patch new file mode 100644 index 0000000..fc4e8df --- /dev/null +++ b/nemo-2.0.1-GTK_STOCK.patch @@ -0,0 +1,19 @@ +Index: nemo-2.0.1/eel/eel-editable-label.c +=================================================================== +--- nemo-2.0.1.orig/eel/eel-editable-label.c ++++ nemo-2.0.1/eel/eel-editable-label.c +@@ -3094,11 +3094,11 @@ popup_targets_received (GtkClipboard + + clipboard_contains_text = gtk_selection_data_targets_include_text (data); + +- append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard", ++ append_action_signal (label, label->popup_menu, "Cu_t", "cut_clipboard", + have_selection); +- append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard", ++ append_action_signal (label, label->popup_menu, "_Copy", "copy_clipboard", + have_selection); +- append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", ++ append_action_signal (label, label->popup_menu, "_Paste", "paste_clipboard", + clipboard_contains_text); + + menuitem = gtk_menu_item_new_with_label (_("Select All")); diff --git a/nemo.changes b/nemo.changes index f0e735d..f50b889 100644 --- a/nemo.changes +++ b/nemo.changes @@ -7,6 +7,8 @@ Mon Oct 21 17:44:21 UTC 2013 - i@marguerite.su - remove lang_package, now cinnamon has a package called translation - use gnome-common's version to wise detect Tumbleweed - add patch: nemo-2.0.1-g_list_copy_deep.patch, fix g_list_copy_deep +- add patch: nemo-2.0.1-view-no-return.patch, fix OBS gcc checks +- add patch: nemo-2.0.1-GTK_STOCK.patch, GTK_STOCK_* deprecated ------------------------------------------------------------------- Mon Nov 19 13:22:52 UTC 2012 - nmo.marques@gmail.com diff --git a/nemo.spec b/nemo.spec index 41e938a..f31bb17 100644 --- a/nemo.spec +++ b/nemo.spec @@ -31,6 +31,8 @@ Source: %{name}-%{version}.tar.gz 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 +Patch2: nemo-2.0.1-GTK_STOCK.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc @@ -55,7 +57,10 @@ BuildRequires: pkgconfig(polkit-agent-1) %if 0%{?gnome_common_ver} == 6 BuildRequires: pkgconfig(tracker-sparql-0.14) %endif -%if 0%{?gnome_common_ver} == 7 || 0%{?gnome_common_ver} == 10 +%if 0%{?gnome_common_ver} == 7 +BuildRequires: pkgconfig(tracker-sparql-0.16) +%endif +%if 0%{?gnome_common_ver} == 10 BuildRequires: pkgconfig(tracker-sparql-0.16) %endif BuildRequires: pkgconfig(x11) @@ -100,6 +105,9 @@ This package provides the GObject Introspection bindings for Nemo. %setup -q %patch0 -p1 %patch1 -p1 +%if 0%{?gnome_common_ver} == 10 +%patch2 -p1 +%endif %build NOCONFIGURE=1 ./autogen.sh