- Update to version 3.4.2.

OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=106

nemo-3.4.1-default-font.patch

@@ -1,94 +0,0 @@
---- a/libnemo-private/nemo-icon-canvas-item.c
-+++ b/libnemo-private/nemo-icon-canvas-item.c
-@@ -1557,14 +1557,18 @@ create_label_layout (NemoIconCanvasItem
- 	pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
- 
- 	/* Create a font description */
--	if (container->details->font) {
-+	if (container->details->font && g_strcmp0 (container->details->font, "") != 0) {
- 		desc = pango_font_description_from_string (container->details->font);
- 	} else {
- 		desc = pango_font_description_copy (pango_context_get_font_description (context));
- 	}
--    pango_font_description_set_size (desc,
--                                     pango_font_description_get_size (desc) +
--                                     container->details->font_size_table [container->details->zoom_level]);
-+
-+	if (pango_font_description_get_size (desc) > 0) {
-+		pango_font_description_set_size (desc,
-+		                                 pango_font_description_get_size (desc) +
-+		                                   container->details->font_size_table [container->details->zoom_level]);
-+	}
-+
- 	pango_layout_set_font_description (layout, desc);
- 	pango_font_description_free (desc);
- 	g_free (zeroified_text);
---- a/libnemo-private/nemo-icon-container.c
-+++ b/libnemo-private/nemo-icon-container.c
-@@ -7043,16 +7043,18 @@ nemo_icon_container_start_renaming_selec
- 	} 
- 
- 	/* Set the right font */
--	if (details->font) {
-+	if (details->font && g_strcmp0 (details->font, "") != 0) {
- 		desc = pango_font_description_from_string (details->font);
- 	} else {
- 		context = gtk_widget_get_pango_context (GTK_WIDGET (container));
- 		desc = pango_font_description_copy (pango_context_get_font_description (context));
- 	}
- 
--    pango_font_description_set_size (desc,
--                                     pango_font_description_get_size (desc) +
--                                     container->details->font_size_table [container->details->zoom_level]);
-+	if (pango_font_description_get_size (desc) > 0) {
-+		pango_font_description_set_size (desc,
-+		                                 pango_font_description_get_size (desc) +
-+		                                   container->details->font_size_table [container->details->zoom_level]);
-+	}
- 
- 	eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (details->rename_widget),
- 						 desc);
---- a/src/nemo-icon-view-grid-container.c
-+++ b/src/nemo-icon-view-grid-container.c
-@@ -1356,6 +1356,7 @@ get_vertical_adjustment (NemoIconContain
-                          gint               icon_size)
- {
-     PangoLayout *layout;
-+    PangoContext *context;
-     PangoFontDescription *desc;
-     gint ellipses_limit;
-     gint height;
-@@ -1364,10 +1365,18 @@ get_vertical_adjustment (NemoIconContain
- 
-     layout = gtk_widget_create_pango_layout (GTK_WIDGET (container), "Test");
- 
--    desc = pango_font_description_from_string (container->details->font);
--    pango_font_description_set_size (desc,
--                                     pango_font_description_get_size (desc) +
--                                     container->details->font_size_table [container->details->zoom_level]);
-+    if (container->details->font && g_strcmp0 (container->details->font, "") != 0) {
-+        desc = pango_font_description_from_string (container->details->font);
-+    } else {
-+        context = gtk_widget_get_pango_context (GTK_WIDGET (container));
-+        desc = pango_font_description_copy (pango_context_get_font_description (context));
-+    }
-+
-+    if (pango_font_description_get_size (desc) > 0) {
-+        pango_font_description_set_size (desc,
-+                                         pango_font_description_get_size (desc) +
-+                                           container->details->font_size_table [container->details->zoom_level]);
-+    }
- 
-     pango_layout_set_font_description (layout, desc);
- 
---- a/src/nemo-style-application.css
-+++ b/src/nemo-style-application.css
-@@ -15,6 +15,8 @@
- 
- .nemo-desktop.nemo-canvas-item {
-     color: #eeeeee;
-+    font-family: Noto Sans;
-+    font-size: 10px;
-     text-shadow: 1px 1px alpha(black, 0.8);
- }
- 

nemo-3.4.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb3fdaf85cd1a336d97a838b40655d5c44bdc7894992595d617c24a5c51ce9ad
-size 1407786

nemo-3.4.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4d0ad41085c3a4e6c4cf367b5dae67b80645f6e13fb00407187bf4eee18d6bd
+size 1416330

nemo.changes

@@ -1,8 +1,101 @@
 -------------------------------------------------------------------
-Sun May 21 14:43:01 UTC 2017 - sor.alexei@meowr.ru
+Wed May 24 14:40:01 UTC 2017 - sor.alexei@meowr.ru
 
-- Add nemo-3.4.1-default-font.patch: Fix usage of the default font
+- Update to version 3.4.2:
-  (commit f9c6439, boo#1040024).
+  * nemo-icon-container.c: don't force a native window for the
+    desktop - fixes prelight hover sticking on the desktop when
+    leaving an icon to pass into another window.
+  * nemo-icon-view-grid-container: Don't show bracketed empty
+    spots, it's tacky.
+  * nemo-main.c: Remove back end requirement (only needed for the
+    desktop).
+  * icon view/desktop: Fix hidpi scaling on the desktop.
+    This also fixes compact view mode in hidpi, which was
+    semi-broken since hidpi was implemented, and very broken since
+    the desktop grid was added.
+  * nemo-icon-dnd.c: Depopulate the dnd grid of the selected icons
+    so insertion marks aren't drawn in the icon's source position.
+  * nemo-window-manager-views.c: Simply close the window if the
+    current view has no backward history, instead of jumping home
+    or to the parent directory. The most common time for this to
+    occur is a directory opened from the desktop - if you delete
+    that directory, the window showing it then shows the desktop in
+    a directory, which doesn't make much sense.
+  * nemo-window-manage-views.c: Invalidate file info before
+    reloading the view, not after.
+    This fixes mount permissions being incorrect.
+  * dnd: Restore capability of "moving" files from and to the
+    desktop via drag'n'drop.
+  * Fetch file-roller mimetype info from a GDesktopAppInfo at
+    startup, instead of a static (and woefully out of date) list.
+  * nemo-file.c: Add EFAULT as a valid exception to the access_ok
+    function. This can throw when the file has just been moved or
+    is in the midst of being moved and the internal asynch updates
+    have not completed yet (usually during a fairly large transfer).
+    As a result, the icon cache problem bar appears needlessly.
+  * desktop: Size thumbnails more appropriately - scale them to our
+    icon size in height only, and allow the width to increase as
+    much as our max text width while maintaining the image aspect
+    ratio.
+  * desktop thumbnails: Pad the thumbnail height when it ends up
+    smaller than the desired height due to aspect ratio and width
+    restrictions.
+    This ensures a nice alignment when keep-aligned is active.
+  * nemo-icon-view-grid-container.c: Highlight the current dnd
+    rectangle in debug mode.
+  * desktop grid: Use the layout size for determining constraint to
+    the canvas bounds instead of max size - this prevents files
+    with very long names from being pushed out of the grid alignment.
+  * misc: Clean up minor leaks, other issues.
+  * desktop grid: Include additional text (Icon Captions) in
+    calculations for the ellipsis limit, and update the desktop
+    when these change - instead of forcing the user to reload or
+    restart to see changes.
+  * nemo-style-application: Remove drop shadow from the selection
+    and pre-light states of desktop icons. The shadows are drawn
+    outside the calculated bounds of these items, and are
+    problematic to account for without doing frequent full screen
+    repaints.
+  * DnD: Draw the highlight box around the entire text when an item
+    is prelit and highlighted as a drop target. The highlight box
+    was only drawing as if to surround only the normal, ellipsised
+    text, rather than the full, unellipsised height.
+  * Set a default font for the desktop - this is overridden by
+    distributions in most cases, but having something is better
+    than leaving it blank - you could set it to "Foo Sans 15"
+    and it would still show the labels, even though you lack that
+    actual font.
+  * Add a default to our theme - Using the default font was always
+    supposed to be a fallback option, however the check in various
+    places for whether the gsettings key is empty or not is incorrect:
+    GSettings::get_string() will always return a string, never
+    NULL, so we need to check if the string is not empty instead
+    (boo#1040024).
+  * desktop: Fix missing icons when "show orphans" is disabled
+    (we were incorrectly interpreting a monitor number of -1 (which
+    means, no previous location) and a missing monitor).
+  * Fix visual sort function - sort function was incorrect for the
+    new grid, and the new order was never set after a sort when
+    running the alignment routine.
+  * nemo-places-sidebar: Use folder-recents for the recent icon.
+  * grid view: Don't re-enable auto-arrange when changing zoom
+    levels.
+  * Desktop dnd - Use more sensible behaviour when keep-aligned is
+    active.
+  * Fix dnd for netscape url drops.
+  * nemo-mime-actions.c: Don't fail for non-local links (like
+    dragged website links) - the check here is for the foreign url,
+    not the local desktop file (link), so it will never succeed,
+    and is not necessary.
+  * DnD: Fix some positioning issues with auto-align local moves,
+    and non-local icon moves (like nemo->nemo-desktop transfers).
+  * nemo-icon-view-grid-container.c: Keep the icon list synched
+    with the visual order of the desktop.
+  * dnd: Split out some container-specific code that had bled over a
+    bit.
+  * Modify desktop icon order.
+  * nemo-file-operations.c: store the desktop location during a
+    duplicate job, to fix DnD duplicate positioning on the desktop.
 
 -------------------------------------------------------------------
 Sun May  7 11:23:03 UTC 2017 - sor.alexei@meowr.ru

nemo.spec

@@ -20,7 +20,7 @@
 %define sover   1
 %define typelib typelib-1_0-Nemo-3_0
 Name:           nemo
-Version:        3.4.1
+Version:        3.4.2
 Release:        0
 Summary:        File browser for Cinnamon
 License:        GPL-2.0+
@@ -31,8 +31,6 @@ Source:         https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-
 Patch0:         %{name}-implicit-pointer-decl.patch
 # PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
 Patch1:         %{name}-void-return-no-return.patch
-# PATCH-FIX-UPSTREAM nemo-3.4.1-default-font.patch boo#1040024 -- Fix usage of the default font (commit f9c6439).
-Patch2:         %{name}-3.4.1-default-font.patch
 BuildRequires:  autoconf
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
@@ -115,7 +113,6 @@ This package provides the GObject Introspection bindings for Nemo.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh