diff --git a/.gitignore b/.gitignore index 6bfdbfe..aae6745 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /nemo-2.8.5.tar.gz /nemo-2.8.6.tar.gz /nemo-2.8.7.tar.gz +/nemo-3.0.0.tar.gz diff --git a/0001-GTK-3.20-fix-wrong-desktop-size.patch b/0001-GTK-3.20-fix-wrong-desktop-size.patch deleted file mode 100644 index cd109d9..0000000 --- a/0001-GTK-3.20-fix-wrong-desktop-size.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae88b2dec8c0a2a53bf3eae1b1d64b264dee7b77 Mon Sep 17 00:00:00 2001 -From: lukefromdc -Date: Wed, 16 Mar 2016 17:13:05 -0400 -Subject: [PATCH] GTK 3.20-fix wrong desktop size - -Reset default size of desktop window to -1 in GTK 3.19/20 only. The combination of a non-resizable -window with a default size is what causes the desktop to open wrong size. - -based on GNOME/nautilus@cf79068 - -"desktop-window: avoid wrong size" - -"gtk+ recently changed and unresizable windows now take into account -the default size set. We set the default size for normal resizable -windows in nautilus." - -"However the desktop window is a no resizable window. What happens now -when setting a default size is that that size is used instead of the -widget request size, since window sizing now takes precedence over -widget sizing." - -"To fix it, set the default size to -1 to override what the nautilus -window does by default, so we can avoid this misbehaviour." ---- - src/nemo-desktop-window.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c -index ce5984b..7ce3e0c 100644 ---- a/src/nemo-desktop-window.c -+++ b/src/nemo-desktop-window.c -@@ -171,6 +171,13 @@ nemo_desktop_window_new (GdkScreen *scre - "screen", screen, - NULL); - -+ /* Stop wrong desktop window size in GTK 3.20*/ -+ /* We don't want to set a default size, which the parent does, since this */ -+ /* will cause the desktop window to open at the wrong size in gtk 3.20 */ -+#if GTK_CHECK_VERSION (3, 19, 0) -+ gtk_window_set_default_size (GTK_WINDOW (window), -1, -1); -+#endif -+ - /* Special sawmill setting*/ - gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Nemo"); - --- -2.5.0 - diff --git a/gcc_6.patch b/gcc_6.patch deleted file mode 100644 index e8a6b8f..0000000 --- a/gcc_6.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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/gtk-3.20_pathbar_fix.patch b/gtk-3.20_pathbar_fix.patch deleted file mode 100644 index d9162a4..0000000 --- a/gtk-3.20_pathbar_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/nemo-pathbar.c -+++ b/src/nemo-pathbar.c -@@ -616,7 +616,9 @@ - if (path_bar->priv->button_list == NULL) { - return; - } -- direction = gtk_widget_get_direction (widget); -+ gtk_widget_get_preferred_width (path_bar->priv->up_slider_button, -+ &path_bar->priv->slider_width, -+ NULL); - - gtk_widget_get_preferred_size (BUTTON_DATA (path_bar->priv->button_list->data)->button, - NULL, &child_requisition); diff --git a/nemo.spec b/nemo.spec index 3a0e433..2a03db4 100644 --- a/nemo.spec +++ b/nemo.spec @@ -2,8 +2,8 @@ Name: nemo Summary: File manager for Cinnamon -Version: 2.8.7 -Release: 3%{?dist} +Version: 3.0.0 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops URL: https://github.com/linuxmint/nemo @@ -12,11 +12,6 @@ URL: https://github.com/linuxmint/nemo #Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%%{version}.git%%{_internal_version}.tar.gz Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz Source1: nemo-fedora.gschema.override -Patch0: nemo_style-classes.patch -Patch1: nemo_style-class-properties-window.patch -Patch2: gcc_6.patch -Patch3: 0001-GTK-3.20-fix-wrong-desktop-size.patch -Patch4: gtk-3.20_pathbar_fix.patch Requires: redhat-menus Requires: gvfs @@ -33,7 +28,7 @@ BuildRequires: pygobject3-base BuildRequires: desktop-file-utils BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(cinnamon-desktop) >= 2.8.0 +BuildRequires: pkgconfig(cinnamon-desktop) >= 3.0.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(exempi-2.0) @@ -135,8 +130,8 @@ fi %postun extensions -p /sbin/ldconfig %files -%doc AUTHORS NEWS README -%license COPYING COPYING-DOCS COPYING.LIB +%doc AUTHORS NEWS +%license COPYING COPYING-DOCS COPYING.LIB COPYING.EXTENSIONS %{_datadir}/nemo/ %{_datadir}/applications/* %{_datadir}/mime/packages/nemo.xml @@ -168,6 +163,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Sun Apr 24 2016 Leigh Scott - 3.0.0-1 +- update to 3.0.0 release + * Sat Mar 26 2016 Leigh Scott - 2.8.7-3 - fix another gtk-3.19 issue diff --git a/nemo_style-class-properties-window.patch b/nemo_style-class-properties-window.patch deleted file mode 100644 index fa77183..0000000 --- a/nemo_style-class-properties-window.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -upr nemo-2.8.6/src/nemo-file-management-properties.glade nemo-2.8.6-test/src/nemo-file-management-properties.glade ---- nemo-2.8.6/src/nemo-file-management-properties.glade 2015-11-27 11:00:22.000000000 +0100 -+++ nemo-2.8.6-test/src/nemo-file-management-properties.glade 2016-02-17 09:05:07.491011645 +0100 -@@ -253,6 +253,9 @@ - center - 800 - 600 -+ - dialog - - diff --git a/nemo_style-classes.patch b/nemo_style-classes.patch deleted file mode 100644 index 0ad2731..0000000 --- a/nemo_style-classes.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 * diff --git a/sources b/sources index f44d219..ab853f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47edbd1a9de47836cfe3e5a4b276ff8d nemo-2.8.7.tar.gz +9fa5552b07f52cba428cd58578258608 nemo-3.0.0.tar.gz