From ebe16651c49ae79feab4ab87a566a4c00a662e13 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Jun 23 2019 16:46:35 +0000 Subject: Update to 4.2.0 release --- diff --git a/gtk3248_fix.patch b/gtk3248_fix.patch deleted file mode 100644 index 960c059..0000000 --- a/gtk3248_fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -From be90b453aa9ddd1873bdab11254b2e1c1326cbf8 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Mon, 17 Jun 2019 22:24:43 -0400 -Subject: [PATCH] nemo-places-sidebar.c: Workaround incorrectly-sized popup - menus when right- clicking on a currently-unselected item. - -This reverts the behavior introduced in gtk 3.24.8: -https://gitlab.gnome.org/GNOME/gtk/commit/57300b49602b856b53f5d30ab3174591c0fb2845 - -By connecting our own handler to 'moved-to-rect' and performing the 'popped-up' -emission ourselves (and at the same time, preventing GtkMenu's own handler from -running), we avoid the fixate call which seems to be causing this. - -Fixes #2118 -Fixes #2153 ---- - src/nemo-places-sidebar.c | 43 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - -diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c -index 87d060e99..61e80fd18 100644 ---- a/src/nemo-places-sidebar.c -+++ b/src/nemo-places-sidebar.c -@@ -3395,6 +3395,42 @@ add_action_popup_items (NemoPlacesSidebar *sidebar) - } - } - -+#if GTK_CHECK_VERSION (3, 24, 8) -+static void -+moved_to_rect_cb (GdkWindow *window, -+ const GdkRectangle *flipped_rect, -+ const GdkRectangle *final_rect, -+ gboolean flipped_x, -+ gboolean flipped_y, -+ GtkMenu *menu) -+{ -+ g_signal_emit_by_name (menu, -+ "popped-up", -+ 0, -+ flipped_rect, -+ final_rect, -+ flipped_x, -+ flipped_y); -+ -+ // Don't let the emission run in gtkmenu.c -+ g_signal_stop_emission_by_name (window, "moved-to-rect"); -+} -+ -+static void -+popup_menu_realized (GtkWidget *menu, -+ gpointer user_data) -+{ -+ GdkWindow *toplevel; -+ -+ toplevel = gtk_widget_get_window (gtk_widget_get_toplevel (menu)); -+ -+ g_signal_handlers_disconnect_by_func (toplevel, moved_to_rect_cb, menu); -+ -+ g_signal_connect (toplevel, "moved-to-rect", G_CALLBACK (moved_to_rect_cb), -+ menu); -+} -+#endif -+ - /* Constructs the popup menu for the file list if needed */ - static void - bookmarks_build_popup_menu (NemoPlacesSidebar *sidebar) -@@ -3415,6 +3451,13 @@ bookmarks_build_popup_menu (NemoPlacesSidebar *sidebar) - G_CALLBACK (popup_menu_deactivated), - sidebar); - -+#if GTK_CHECK_VERSION (3, 24, 8) -+ g_signal_connect (sidebar->popup_menu, "realize", -+ G_CALLBACK (popup_menu_realized), -+ sidebar); -+ gtk_widget_realize (sidebar->popup_menu); -+#endif -+ - gtk_menu_attach_to_widget (GTK_MENU (sidebar->popup_menu), - GTK_WIDGET (sidebar), - bookmarks_popup_menu_detach_cb); diff --git a/nemo.spec b/nemo.spec index fc736b7..83968e7 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,23 +1,22 @@ Name: nemo Summary: File manager for Cinnamon -Version: 4.0.6 -Release: 3%{?dist} +Version: 4.2.0 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} -Source0: %url/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz Source1: nemo-fedora.gschema.override Patch0: remove_desktop_search.patch Patch1: Don-t-scale-text-size-when-zooming.patch -Patch2: https://github.com/mtwebster/nemo/commit/be90b453aa9ddd1873bdab11254b2e1c1326cbf8.patch#/gtk3248_fix.patch Requires: redhat-menus -Requires: gvfs%{_isa} -Requires: gvfs-goa%{_isa} +Requires: gvfs%{?_isa} +Requires: gvfs-goa%{?_isa} Requires: gnome-icon-theme -Requires: xapps%{_isa} >= 1.4.0 +Requires: xapps%{?_isa} >= 1.4.0 # required for for gtk-stock fallback Requires: gnome-icon-theme-legacy -Requires: cinnamon-translations +Requires: cinnamon-translations >= 4.2.0 BuildRequires: meson BuildRequires: intltool @@ -25,14 +24,14 @@ BuildRequires: python3-gobject-base BuildRequires: desktop-file-utils BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(cinnamon-desktop) >= 4.0.0 +BuildRequires: pkgconfig(cinnamon-desktop) >= 4.2.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(xapp) >= 1.4.0 +BuildRequires: pkgconfig(xapp) >= 1.4.6 # the main binary links against libnemo-extension.so # don't depend on soname, rather on exact version @@ -124,6 +123,9 @@ rm -f %buildroot%{_datadir}/icons/hicolor/.icon-theme.cache %{_datadir}/gir-1.0/*.gir %changelog +* Sun Jun 23 2019 Leigh Scott - 4.2.0-1 +- Update to 4.2.0 release + * Tue Jun 18 2019 Leigh Scott - 4.0.6-3 - Fix gtk-3.24.8 scroll issue diff --git a/sources b/sources index 20315e8..6d96ac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nemo-4.0.6.tar.gz) = 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f +SHA512 (nemo-4.2.0.tar.gz) = 5c41617d8babb89444dde7e448d06057b66eb4de6c6480b90ee550502ee0fe296a25a99d89abcfafe33023b420ef58c58545589a50d00f9e049c016ba0a39ef0