diff -ruN gtk+3.0-3.14.4-1/debian/changelog gtk+3.0-3.14.4-2/debian/changelog --- gtk+3.0-3.14.4-1/debian/changelog 2014-10-23 17:43:33.000000000 +0400 +++ gtk+3.0-3.14.4-2/debian/changelog 2014-11-04 17:20:06.000000000 +0300 @@ -1,3 +1,14 @@ +gtk+3.0 (3.14.4-2) unstable; urgency=medium + + [ Rico Tzschichholz ] + * Install org.gtk.Settings.Debug.gschema.xml + + [ Dmitry Shachnev ] + * debian/patches/077_fix_menu_height_calculating.patch: backport upstream + commit to fix calculation of menu height (closes: #767906). + + -- Dmitry Shachnev Tue, 04 Nov 2014 17:19:48 +0300 + gtk+3.0 (3.14.4-1) unstable; urgency=medium * New upstream release. diff -ruN gtk+3.0-3.14.4-1/debian/libgtk-3-dev.install gtk+3.0-3.14.4-2/debian/libgtk-3-dev.install --- gtk+3.0-3.14.4-1/debian/libgtk-3-dev.install 2013-05-23 17:18:15.000000000 +0400 +++ gtk+3.0-3.14.4-2/debian/libgtk-3-dev.install 2014-11-04 17:19:46.000000000 +0300 @@ -3,4 +3,5 @@ usr/lib/*/pkgconfig/g?k* usr/share/aclocal usr/share/gir-1.0 +usr/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml usr/share/gtk-3.0/gtkbuilder.rng diff -ruN gtk+3.0-3.14.4-1/debian/patches/077_fix_menu_height_calculating.patch gtk+3.0-3.14.4-2/debian/patches/077_fix_menu_height_calculating.patch --- gtk+3.0-3.14.4-1/debian/patches/077_fix_menu_height_calculating.patch 1970-01-01 03:00:00.000000000 +0300 +++ gtk+3.0-3.14.4-2/debian/patches/077_fix_menu_height_calculating.patch 2014-11-04 17:19:46.000000000 +0300 @@ -0,0 +1,30 @@ +Description: gtkmenu: fix unnecessary scroll buttons +Origin: upstream, https://git.gnome.org/browse/gtk+/commit/?id=bdaef1f88d44ca26 +Last-Update: 2014-11-04 + +--- a/gtk/gtkmenu.c ++++ b/gtk/gtkmenu.c +@@ -3347,6 +3347,7 @@ + { + GdkScreen *screen = gtk_widget_get_screen (priv->toplevel); + GdkRectangle monitor; ++ GtkBorder border; + + gdk_screen_get_monitor_workarea (screen, priv->monitor_num, &monitor); + +@@ -3356,10 +3357,12 @@ + if (priv->position_y + nat_height > monitor.y + monitor.height) + nat_height = monitor.y + monitor.height - priv->position_y; + +- if (priv->position_y < monitor.y) ++ _gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border); ++ ++ if (priv->position_y + border.top < monitor.y) + { +- min_height -= monitor.y - priv->position_y; +- nat_height -= monitor.y - priv->position_y; ++ min_height -= monitor.y - (priv->position_y + border.top); ++ nat_height -= monitor.y - (priv->position_y + border.top); + } + } + diff -ruN gtk+3.0-3.14.4-1/debian/patches/series gtk+3.0-3.14.4-2/debian/patches/series --- gtk+3.0-3.14.4-1/debian/patches/series 2014-10-14 00:50:01.000000000 +0400 +++ gtk+3.0-3.14.4-2/debian/patches/series 2014-11-04 17:19:46.000000000 +0300 @@ -12,3 +12,4 @@ 061_multiarch_module_fallback.patch 071_fix-installation-of-HTML-images.patch reftest-known-fail.patch +077_fix_menu_height_calculating.patch