Accepting request 538174 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/538174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemo?expand=0&rev=18

nemo-3.4.7.tar.gz

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

nemo-3.6.2.tar.gz

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

nemo-implicit-pointer-decl.patch

@@ -1,21 +0,0 @@
---- a/libnemo-private/nemo-file-undo-operations.c
-+++ b/libnemo-private/nemo-file-undo-operations.c
-@@ -1135,7 +1135,7 @@ trash_retrieve_files_to_restore_thread (
- 					trash_time = 0;
- 				}
- 
--				if (abs (orig_trash_time - trash_time) <= TRASH_TIME_EPSILON) {
-+				if (ABS (orig_trash_time - trash_time) <= TRASH_TIME_EPSILON) {
- 					/* File in the trash */
- 					item = g_file_get_child (trash, g_file_info_get_name (info));
- 					g_hash_table_insert (to_restore, item, g_object_ref (origfile));
---- a/libnemo-private/nemo-widget-menu-item.c
-+++ b/libnemo-private/nemo-widget-menu-item.c
-@@ -17,6 +17,7 @@
- 
- #include "nemo-widget-menu-item.h"
- #include "nemo-widget-action.h"
-+#include <string.h>
- 
- enum {
-   PROP_0,

nemo-void-return-no-return.patch

@@ -1,30 +0,0 @@
---- a/libnemo-private/nemo-action.c
-+++ b/libnemo-private/nemo-action.c
-@@ -1322,6 +1322,7 @@ check_gsettings_condition (NemoAction *a
-         g_strfreev (split);
-         return FALSE;
-     }
-+    return 0;
- }
- 
- static gboolean
---- a/libnemo-private/nemo-desktop-utils.c
-+++ b/libnemo-private/nemo-desktop-utils.c
-@@ -92,6 +92,7 @@ nemo_desktop_utils_get_primary_monitor (
-             return i;
-         }
-     }
-+    return -1;
- #else
-     ensure_screen ();
- 
---- a/libnemo-private/nemo-monitor.c
-+++ b/libnemo-private/nemo-monitor.c
-@@ -78,6 +78,7 @@ schedule_call_consume_changes (void)
-       call_consume_changes_idle_id =
-           g_idle_add (call_consume_changes_idle_cb, NULL);
-   }
-+  return 0;
- }
- 
- static void

nemo.changes

@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sat Oct 28 19:57:36 UTC 2017 - sor.alexei@meowr.ru
+
+- Update to version 3.6.2 (changes since 3.4.7):
+  * actions: Escape single and double quotes that are part of a
+    file path. Add a "Terminal" key in the nemo_action file, to
+    execute the Exec line in a terminal window.
+  * actions: Update sample action for Terminal keyword, update
+    nemo_action sourceview files.
+  * actions: Only use nemo_launch_application_from_command_array()
+    when Terminal=true. This ensures compatibility with existing
+    actions, which will continue to use g_spawn_async().
+  * nemo-icon-info.h: Use standard icon sizes for the desktop.
+  * nemo-action.c: Fixup a few compiler warnings.
+  * nemo-icon-private.h: Avoid memory padding. Save a little memory
+    use by rearranging the fields to avoid memory padding in
+    structures.
+  * eel-editable-label.h: Avoid memory padding. Move fields in a
+    structure to avoid memory padding made padding explicit to 
+    avoid warning messages if the padding compiler warnings are on.
+  * nemo-file-undo-operations.c: Use GQueue instead of GList for
+    our undo file pair lists.
+  * nemo-file-operations.c: Use g_remove for native (path-reachable)
+    files. Allowing the normal g_file_delete involves gvfs whether
+    the file is native or not.
+  * nemo.desktop: Remove DBusActivatable line - we don't actually
+    support it yet, it was an unnecessary change in ad5fcfc.
+    This ends up just causing issues with getting nemo to launch in
+    more up-to-date distributions.
+  * nemo-icon-container.c: Always treat desktop pseudo-files as
+    semi-placed icons - that is, they can have their positions
+    stored, then restored later, but their position can be adjusted
+    upon placement if their previously stored position is now
+    occupied.
+  * nemo-progress-ui-handler.c: Use XAppGtkWindow for the progress
+    window, so we can pass progress info to Cinnamon.
+  * nemo-desktop-manager: Refactor and expand to integrate better
+    with Cinnamon.
+  * plugin manager: Allow launching of an extension's config
+    application from the plugin window, rather than having it in
+    the main menu.
+  * desktop: Handle blank desktop windows properly during monitor
+    change events.
+  * nemo-desktop-manager.c: Don't just try to resize existing
+    desktops if the number of monitors has changed. In this case,
+    do a full re-layout.
+  * nemo-progress-ui-handler.c: Don't update the status icon if
+    it's not being shown.
+  * nemo-file-operations.c: Reduce progress ui update frequency
+    during file operations.
+  * Fix some warnings in libnemo-private
+  * nemo-desktop-manager.c: Don't run on_run_state_changed() during
+    the init phase when it's a fallback session as it can cause a
+    nasty recursion problem resulting in a crash.
+  * nemo-directory-async.c: Hold the directory alive for the
+    duration of an extension provider job, to ensure clean
+    termination to the job when asynchronous info providers are
+    used.
+  * dbus services: Normalise file names.
+  * desktop: Don't show the "Show hidden files" menu item. We have
+    never show hidden files on the desktop, so having this is
+    misleading.
+  * Add .rar and .7z to the archive mounting action.
+  * When activating files on the desktop (only), deselect them
+    after activating them.
+  * nemo-toolbar.c: Add an option to hide an elevated privileges
+    warning.
+  * Rename show-superuser-toolbar to show-root-warning.
+  * file: Let renames work on Google Drive Renaming. An item on
+    Google Drive does not change the actual GVfs path because the
+    path is made up of document-ids, which do not change.
+    A rename operation only affects the title of the entry.
+    In GIO terms, only the standard::display-name changes, but the
+    standard::name remains the same.
+  * file, file-undo-operations: Let renames on Google Drive be
+    undone. We really should be using standard::display-name when
+    renaming files - g_file_get_basename is simply not the right
+    thing to use. Moreover, in case of Google Drive, the URI might
+    not change with the display name and we can not get the old
+    display name from the old GFile.
+  * A send by mail action.
+  * Fix permissions on files/usr/share/nemo/actions/send-by-mail.py
+  * Update the man page.
+  * Update translations.
+- Remove nemo-implicit-pointer-decl.patch,
+  nemo-void-return-no-return.patch: merged upstream.
+
 -------------------------------------------------------------------
 Sun Aug 20 16:09:40 UTC 2017 - sor.alexei@meowr.ru
 

nemo.spec

@@ -20,17 +20,13 @@
 %define sover   1
 %define typelib typelib-1_0-Nemo-3_0
 Name:           nemo
-Version:        3.4.7
+Version:        3.6.2
 Release:        0
 Summary:        File browser for Cinnamon
 License:        GPL-2.0+
 Group:          System/GUI/Other
 Url:            https://github.com/linuxmint/nemo
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks.
-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
 BuildRequires:  autoconf
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
@@ -61,7 +57,8 @@ BuildRequires:  pkgconfig(libselinux)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(x11)
-Requires:       cinnamon-translations
+BuildRequires:  pkgconfig(xapp) >= 1.0.4
+Requires:       %{name}-lang
 Requires:       desktop-file-utils >= 0.7
 Requires:       glib2-tools
 Requires:       gvfs >= 1.3.2
@@ -111,8 +108,6 @@ This package provides the GObject Introspection bindings for Nemo.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -136,6 +131,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/
 
 %fdupes %{buildroot}%{_datadir}/
 
+%if 0%{?suse_version} <= 1320
 %post
 %icon_theme_cache_post
 %desktop_database_post
@@ -147,6 +143,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/
 %desktop_database_postun
 %mime_database_postun
 %glib2_gsettings_schema_postun
+%endif
 
 %post -n %{soname}%{sover} -p /sbin/ldconfig
 
@@ -161,8 +158,8 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man?/%{name}*%{?ext_man}
-%{_datadir}/dbus-1/services/org.Nemo.service
+%{_datadir}/dbus-1/services/nemo.service
-%{_datadir}/dbus-1/services/org.nemo.freedesktop.FileManager1.service
+%{_datadir}/dbus-1/services/nemo.FileManager1.service
 %{_datadir}/glib-2.0/schemas/org.nemo.gschema.xml
 %{_datadir}/gtksourceview-?.0/language-specs/%{name}_action.lang
 %{_datadir}/polkit-1/actions/org.nemo.root.policy