From dec19c28140ebff3f8f68ea03981a95e9bd8e7923a30582202814a91ebdd44dc Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 9 Nov 2016 12:16:13 +0000 Subject: [PATCH] - Update to version 3.2.0. OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=99 --- nemo-3.0.6.tar.gz | 3 -- nemo-3.2.0.tar.gz | 3 ++ nemo-fix-desktop-redraw.patch | 42 ------------------- nemo-implicit-pointer-decl.patch | 17 ++++++-- nemo-void-return-no-return.patch | 19 +++++++++ nemo.changes | 71 ++++++++++++++++++++++++++++++++ nemo.spec | 19 +++++---- 7 files changed, 116 insertions(+), 58 deletions(-) delete mode 100644 nemo-3.0.6.tar.gz create mode 100644 nemo-3.2.0.tar.gz delete mode 100644 nemo-fix-desktop-redraw.patch diff --git a/nemo-3.0.6.tar.gz b/nemo-3.0.6.tar.gz deleted file mode 100644 index 10ab376..0000000 --- a/nemo-3.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a2704e110a30625f9e807d21df44a577606d383c1eaf1ef4dae0e4dd321cdec -size 1363302 diff --git a/nemo-3.2.0.tar.gz b/nemo-3.2.0.tar.gz new file mode 100644 index 0000000..1fd23cb --- /dev/null +++ b/nemo-3.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84c5b0a1999c1b2ab08bd6933aa7c5bc18bb2805e52f2d7fdf2af644cd7cc8ac +size 1365508 diff --git a/nemo-fix-desktop-redraw.patch b/nemo-fix-desktop-redraw.patch deleted file mode 100644 index 42a3474..0000000 --- a/nemo-fix-desktop-redraw.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/libnemo-private/nemo-icon-container.c -+++ b/libnemo-private/nemo-icon-container.c -@@ -4249,11 +4249,13 @@ realize (GtkWidget *widget) - - container = NEMO_ICON_CONTAINER (widget); - -+#if !GTK_CHECK_VERSION(3, 21, 0) - /* Ensure that the desktop window is native so the background - set on it is drawn by X. */ - if (container->details->is_desktop) { - gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget))); - } -+#endif - - /* Set up DnD. */ - nemo_icon_dnd_init (container); ---- a/src/nemo-desktop-icon-view.c -+++ b/src/nemo-desktop-icon-view.c -@@ -155,6 +155,10 @@ nemo_desktop_icon_view_class_init (NemoD - vclass->update_menus = real_update_menus; - vclass->get_view_id = real_get_id; - -+#if GTK_CHECK_VERSION(3, 21, 0) -+ GtkWidgetClass *wclass = GTK_WIDGET_CLASS (class); -+ gtk_widget_class_set_css_name (wclass, "nemo-desktop-icon-view"); -+#endif - g_type_class_add_private (class, sizeof (NemoDesktopIconViewDetails)); - } - ---- a/src/nemo-style-application.css -+++ b/src/nemo-style-application.css -@@ -1,5 +1,10 @@ - /* Desktop text stuff */ - -+.nemo-window.nemo-desktop-window notebook, -+.nemo-window.nemo-desktop-window paned { -+ background-color: transparent; -+} -+ - .nemo-canvas-item { - border-radius: 3px; - } diff --git a/nemo-implicit-pointer-decl.patch b/nemo-implicit-pointer-decl.patch index 932462f..165fdce 100644 --- a/nemo-implicit-pointer-decl.patch +++ b/nemo-implicit-pointer-decl.patch @@ -1,7 +1,16 @@ -Index: nemo-2.4.0/libnemo-private/nemo-widget-menu-item.c -=================================================================== ---- nemo-2.4.0.orig/libnemo-private/nemo-widget-menu-item.c -+++ nemo-2.4.0/libnemo-private/nemo-widget-menu-item.c +--- 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" diff --git a/nemo-void-return-no-return.patch b/nemo-void-return-no-return.patch index 8df76ff..c0a4b0e 100644 --- a/nemo-void-return-no-return.patch +++ b/nemo-void-return-no-return.patch @@ -8,6 +8,25 @@ } static gboolean +--- a/libnemo-private/nemo-desktop-utils.c ++++ b/libnemo-private/nemo-desktop-utils.c +@@ -82,15 +82,7 @@ nemo_desktop_utils_get_primary_monitor ( + #if GTK_CHECK_VERSION (3, 22, 0) + ensure_display (); + +- gint n_mon = gdk_display_get_n_monitors (default_display); +- gint i; +- +- for (i = 0; i < n_mon; i ++) { +- GdkMonitor *monitor = gdk_display_get_monitor (default_display, i); +- if (gdk_monitor_is_primary (monitor)) { +- return i; +- } +- } ++ return gdk_display_get_primary_monitor (default_display); + #else + ensure_screen (); + --- a/libnemo-private/nemo-monitor.c +++ b/libnemo-private/nemo-monitor.c @@ -78,6 +78,7 @@ schedule_call_consume_changes (void) diff --git a/nemo.changes b/nemo.changes index 20dbd54..917036b 100644 --- a/nemo.changes +++ b/nemo.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Tue Nov 8 13:01:41 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 3.2.0: + * Migrate away from gnome-common deprecated vars and macros. + * Fix GCC pointer signedness warnings. + * Add a .view style class on the icon view scrolled window. + * window: Remove a custom get_preferred_width/height implementation. + We already take care of the default size when we create the + window, and these only break assumptions of the default + GtkWindow's handlers. + * pathbar: Avoid GTK+ warnings. + * pathbar: Remove a hardcoded width for sliders. + * Close an open_as_root child on child exit. + * nemo-context-menu-menu-item.c: Use correct grammar in the + context menu toggle. + * Fix a GTK+ 3.21.3+ desktop redraw issue (gh#linuxmint/nemo#1231). + * Replace a deprecated gtk_icon_info_free() with g_object_unref(). + * file-operations: Reduce the time for reliable transfer rate. + * Remove a 'Show text in icon' preference. + * nemo-view.c: Unescape uris being passed to file-roller during + drag-and-drop (replaces %20 with spaces). + * Expand grid width to canvas. + * Minimum of one column. + * Update nemo-file.c. + * trash-monitor: Change trash monitoring process. + * Fix --geometry option when Nemo is already running. + * Keep warnings as warnings when building the packages. + * nemo-window.c: Save sidebar width 100ms after last change. + * nemo-application.c: Fix maximised window state preservation. + * Remove conditional ellipsis code for GTK+ < 3.12.0 builds. + * Bind double left click on blank to go to parent directory. + * Add an option to manage double cick in blank area (off by + default) because it changes previous behaviour. + * nemo-file.c: Only append .desktop to desktop files when they + actually need it. Trusted desktop files (ones that typically + get made and placed on the desktop) don't show their extension, + so when you try to rename them, the new name needs .desktop + appended to it. + * nemo-file-management-properties.glade: Improve the description + of the click-to-rename feature. + * nemo-thumbnails.c: Don't set a stack size. + * nemo-application.c: Look for already-existing desktop windows + before attempting to manage the desktop. + * desktop: Don't rebuild the desktop any time _NET_WORKAREA + changes - this can happen fairly frequently in some situations, + causing crashes due to the asynchronous nature of nemo's + directory loading back-end. + * eel-gnome-extensions.c: Use preferred terminal emulator when + using "Run in terminal" to execute something. + * nemo-desktop-manager.c: Run layout_changed when the widget + scale factor changes. + * file-undo-operations: Change trashed files matching condition. + * icon view: Use the correct container size for applying margins + to the icon container. Also, make sure icon data is fully + loaded before positioning items - desktop pseudo-items don't + necessarily have the correct bounding boxes defined by the time + layout occurs. Load this data just before trying to position + the icon, rather than just after. + * nemo-desktop-utils: Adjustments for Gtk 3.22 changes in monitor + management. gdk_screen_get_monitor_workarea() no longer returns + a valid workarea, it simply returns the geometry. + * nemo-desktop-manager.c: Reload the desktop in an idle callback. + * nemo-application.c: Add a whitelist for ignoring existing + desktop handlers by WM_CLASS match. By default 'conky' is in + the list. +- Remove nemo-fix-desktop-redraw.patch: fixed upstream. +- Move gtk-doc to the devel package. +- Update nemo-implicit-pointer-decl.patch and + nemo-void-return-no-return.patch. + ------------------------------------------------------------------- Tue Sep 27 12:38:17 UTC 2016 - sor.alexei@meowr.ru diff --git a/nemo.spec b/nemo.spec index 0b96698..8f2ab02 100644 --- a/nemo.spec +++ b/nemo.spec @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.0.6 +Version: 3.2.0 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0+ @@ -31,13 +31,15 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}- Patch1: %{name}-implicit-pointer-decl.patch # PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks. Patch2: %{name}-void-return-no-return.patch -# PATCH-FIX-UPSTREAM nemo-fix-desktop-redraw.patch boo#1001431 gh#linuxmint/nemo#1231 -- Fix a GTK+ 3.21.3+ desktop redraw issue (commit 4e5a103). -Patch3: %{name}-fix-desktop-redraw.patch +BuildRequires: autoconf +BuildRequires: autoconf-archive +BuildRequires: automake BuildRequires: cinnamon-translations BuildRequires: fdupes -BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme +BuildRequires: intltool +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-gobject BuildRequires: python3-polib @@ -50,7 +52,7 @@ BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libexif) @@ -111,16 +113,15 @@ This package provides the GObject Introspection bindings for Nemo. %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh +NOCONFIGURE=1 ./autogen.sh %configure \ --libexecdir=%{_libexecdir}/%{name} \ --disable-static \ --disable-update-mimedb \ --enable-gtk-doc -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install @@ -173,7 +174,6 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/ %files -n %{soname}%{sover} %defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/libnemo-extension %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/extensions-3.0/ %{_libdir}/%{soname}.so.%{sover}* @@ -184,5 +184,6 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/ %{_libdir}/%{soname}.so %{_libdir}/pkgconfig/%{soname}.pc %{_datadir}/gir-1.0/Nemo-3.0.gir +%{_datadir}/gtk-doc/html/libnemo-extension/ %changelog