Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2018-07-22 23:05:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Sun Jul 22 23:05:49 2018 rev:27 rq:624430 version:3.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2018-07-14 20:25:19.556202334 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2018-07-22 23:05:51.092894639 +0200 @@ -1,0 +2,8 @@ +Fri Jul 20 09:32:54 UTC 2018 - [email protected] + +- Update to version 3.8.5: + * eel-gtk-extensions.c: Fix menu popups when a valid event is not + provided. +- Rebase nemo-gtk-3.20.patch. + +------------------------------------------------------------------- Old: ---- nemo-3.8.4.tar.gz New: ---- nemo-3.8.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.Dby3JX/_old 2018-07-22 23:05:52.224894218 +0200 +++ /var/tmp/diff_new_pack.Dby3JX/_new 2018-07-22 23:05:52.240894212 +0200 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.8.4 +Version: 3.8.5 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0-or-later ++++++ nemo-3.8.4.tar.gz -> nemo-3.8.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.4/debian/changelog new/nemo-3.8.5/debian/changelog --- old/nemo-3.8.4/debian/changelog 2018-07-05 11:40:01.000000000 +0200 +++ new/nemo-3.8.5/debian/changelog 2018-07-17 09:44:05.000000000 +0200 @@ -1,3 +1,10 @@ +nemo (3.8.5) tara; urgency=medium + + [ Michael Webster ] + * eel-gtk-extensions.c: Fix menu popups when a valid event is not provided. + + -- Clement Lefebvre <[email protected]> Tue, 17 Jul 2018 09:43:41 +0200 + nemo (3.8.4) tara; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.4/eel/eel-gtk-extensions.c new/nemo-3.8.5/eel/eel-gtk-extensions.c --- old/nemo-3.8.4/eel/eel-gtk-extensions.c 2018-07-05 11:40:01.000000000 +0200 +++ new/nemo-3.8.5/eel/eel-gtk-extensions.c 2018-07-17 09:44:05.000000000 +0200 @@ -280,14 +280,22 @@ */ if (event) { - button = event->type == GDK_BUTTON_RELEASE - ? 0 - : event->button; + button = event->type == GDK_BUTTON_RELEASE ? 0 : event->button; } else { button = 0; } - gtk_menu_popup_at_pointer (menu, (GdkEvent *) event); + if (button > 0) { + gtk_menu_popup_at_pointer (menu, (GdkEvent *) event); + } else { + gtk_menu_popup (menu, /* menu */ + NULL, /* parent_menu_shell */ + NULL, /* parent_menu_item */ + NULL, /* popup_position_func */ + NULL, /* popup_position_data */ + button, /* button */ + event ? event->time : gtk_get_current_event_time ()); /* activate_time */ + } g_object_ref_sink (menu); g_object_unref (menu); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.4/meson.build new/nemo-3.8.5/meson.build --- old/nemo-3.8.4/meson.build 2018-07-05 11:40:01.000000000 +0200 +++ new/nemo-3.8.5/meson.build 2018-07-17 09:44:05.000000000 +0200 @@ -1,7 +1,7 @@ # Meson build file # https://github.com/linuxmint/nemo -project('nemo', 'c', version: '3.8.4', +project('nemo', 'c', version: '3.8.5', meson_version: '>=0.37.0' ) ++++++ nemo-gtk-3.20.patch ++++++ --- /var/tmp/diff_new_pack.Dby3JX/_old 2018-07-22 23:05:52.928893956 +0200 +++ /var/tmp/diff_new_pack.Dby3JX/_new 2018-07-22 23:05:52.928893956 +0200 @@ -1,15 +1,16 @@ --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c -@@ -287,7 +287,12 @@ eel_pop_up_context_menu (GtkMenu *menu, +@@ -285,9 +285,13 @@ eel_pop_up_context_menu (GtkMenu *menu, button = 0; } +#if GTK_CHECK_VERSION (3, 22, 0) - gtk_menu_popup_at_pointer (menu, (GdkEvent *) event); + if (button > 0) { + gtk_menu_popup_at_pointer (menu, (GdkEvent *) event); + } else { +#else -+ gtk_menu_popup (menu, NULL, NULL, NULL, NULL, -+ button, event ? event->time : GDK_CURRENT_TIME); ++ if (TRUE) { +#endif - - g_object_ref_sink (menu); - g_object_unref (menu); + gtk_menu_popup (menu, /* menu */ + NULL, /* parent_menu_shell */ + NULL, /* parent_menu_item */
