Update to 2.24.32

... and rebase window-dragging.patch
This commit is contained in:
Kalev Lember 2018-01-09 12:18:41 +01:00
parent fd7ca354fe
commit 8fbd0ade83
4 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -34,3 +34,4 @@ gtk+-2.21.5.tar.bz2
/gtk+-2.24.29.tar.xz
/gtk+-2.24.30.tar.xz
/gtk+-2.24.31.tar.xz
/gtk+-2.24.32.tar.xz

View File

@ -19,8 +19,8 @@
Summary: GTK+ graphical user interface library
Name: gtk2
Version: 2.24.31
Release: 6%{?dist}
Version: 2.24.32
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@ -326,6 +326,9 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
%doc tmpdocs/examples
%changelog
* Tue Jan 09 2018 Kalev Lember <klember@redhat.com> - 2.24.32-1
- Update to 2.24.32
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.24.31-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -1 +1 @@
526a1008586094a2cbb4592fd3f9ee10 gtk+-2.24.31.tar.xz
SHA512 (gtk+-2.24.32.tar.xz) = 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696

View File

@ -5,7 +5,7 @@ diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenus
if (!menu_shell->active || !menu_shell->button)
{
- _gtk_menu_shell_activate (menu_shell);
- gtk_menu_shell_activate (menu_shell);
+ gboolean initially_active = menu_shell->active;
menu_shell->button = event->button;
@ -22,7 +22,7 @@ diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenus
{
- menu_shell->activate_time = event->time;
- gtk_menu_shell_select_item (menu_shell, menu_item);
+ _gtk_menu_shell_activate (menu_shell);
+ gtk_menu_shell_activate (menu_shell);
+ menu_shell->button = event->button;
+
+ if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)