From b65f56bf2343f821229c967bbb734962c3f0490c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Feb 14 2016 08:28:59 +0000 Subject: fix gcc-6.0 compile error --- diff --git a/gcc_6.patch b/gcc_6.patch new file mode 100644 index 0000000..e8a6b8f --- /dev/null +++ b/gcc_6.patch @@ -0,0 +1,16 @@ +--- a/src/nemo-notebook.c ++++ b/src/nemo-notebook.c +@@ -51,11 +51,13 @@ + static void nemo_notebook_remove (GtkContainer *container, + GtkWidget *tab_widget); + ++#if 0 + static const GtkTargetEntry url_drag_types[] = + { + { NEMO_ICON_DND_GNOME_ICON_LIST_TYPE, 0, NEMO_ICON_DND_GNOME_ICON_LIST }, + { NEMO_ICON_DND_URI_LIST_TYPE, 0, NEMO_ICON_DND_URI_LIST }, + }; ++#endif + + enum + { diff --git a/nemo.spec b/nemo.spec index 19df28d..1b24b5e 100644 --- a/nemo.spec +++ b/nemo.spec @@ -3,7 +3,7 @@ Name: nemo Summary: File manager for Cinnamon Version: 2.8.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops URL: https://github.com/linuxmint/nemo @@ -13,6 +13,8 @@ URL: https://github.com/linuxmint/nemo Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz Source1: nemo-fedora.gschema.override Patch0: 0001-improve-context-menu-toggle.patch +Patch1: gcc_6.patch +Patch2: nemo_style-classes.patch Requires: redhat-menus Requires: gvfs @@ -164,6 +166,10 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Sun Feb 14 2016 Leigh Scott - 2.8.6-3 +- fix gcc-6.0 compile error +- add style classes patch + * Thu Feb 04 2016 Fedora Release Engineering - 2.8.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/nemo_style-classes.patch b/nemo_style-classes.patch new file mode 100644 index 0000000..0ad2731 --- /dev/null +++ b/nemo_style-classes.patch @@ -0,0 +1,30 @@ +diff -upr nemo-2.8.6/src/nemo-window.c nemo-2.8.6-test/src/nemo-window.c +--- nemo-2.8.6/src/nemo-window.c 2015-11-27 11:00:22.000000000 +0100 ++++ nemo-2.8.6-test/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 -upr nemo-2.8.6/src/nemo-window-pane.c nemo-2.8.6-test/src/nemo-window-pane.c +--- nemo-2.8.6/src/nemo-window-pane.c 2015-11-27 11:00:22.000000000 +0100 ++++ nemo-2.8.6-test/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 *