callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New upstream release.

Browse Source 
* Update build-dependencies according to configure.ac changes:
  - bump libglib2.0-dev to >= 2.49.4
  - bump wayland-protocols to >= 1.6
* Fix debian/patches/no-accessibility-dump.patch to apply again.
* Drop d/p/Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch
  - now included in upstream release.
* Update debian/libgtk-3-0.symbols with several additions and one missing:
  - gdk_wayland_display_get_xdg_shell unused outside of gtk+.
This commit is contained in:
Andreas Henriksson
2016-08-30 17:06:06 +00:00
parent c93e52b66e
commit 53d4816f85
7 changed files with 50 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,9 +1,20 @@
gtk+3.0 (3.21.4-2) UNRELEASED; urgency=medium
gtk+3.0 (3.21.5-1) unstable; urgency=low
[ Simon McVittie ]
* Merge packaging changes from 3.20.9-1 in unstable
-- Jeremy Bicha <jbicha@ubuntu.com> Thu, 04 Aug 2016 13:16:39 -0400
[ Andreas Henriksson ]
* New upstream release.
* Update build-dependencies according to configure.ac changes:
- bump libglib2.0-dev to >= 2.49.4
- bump wayland-protocols to >= 1.6
* Fix debian/patches/no-accessibility-dump.patch to apply again.
* Drop d/p/Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch
- now included in upstream release.
* Update debian/libgtk-3-0.symbols with several additions and one missing:
- gdk_wayland_display_get_xdg_shell unused outside of gtk+.
-- Andreas Henriksson <andreas@fatal.se> Tue, 30 Aug 2016 18:13:45 +0200
gtk+3.0 (3.20.9-1) unstable; urgency=medium

6
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+3.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Michael Biebl <biebl@debian.org>
Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 9.20141010),
cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.11),
@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9.20141010),
gsettings-desktop-schemas <!nocheck>,
adwaita-icon-theme <!nocheck>,
at-spi2-core <!nocheck>,
libglib2.0-dev (>= 2.49.3),
libglib2.0-dev (>= 2.49.4),
libgdk-pixbuf2.0-dev (>= 2.30.0),
libpango1.0-dev (>= 1.37.3),
libatk1.0-dev (>= 2.15.1),
@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9.20141010),
libepoxy-dev,
libharfbuzz-dev (>= 0.9),
libwayland-dev (>= 1.9.91) [linux-any],
wayland-protocols (>= 1.3) [linux-any],
wayland-protocols (>= 1.6) [linux-any],
libxkbcommon-dev (>= 0.2.0),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),

4
debian/control.in vendored
View File

@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9.20141010),
gsettings-desktop-schemas <!nocheck>,
adwaita-icon-theme <!nocheck>,
at-spi2-core <!nocheck>,
libglib2.0-dev (>= 2.49.3),
libglib2.0-dev (>= 2.49.4),
libgdk-pixbuf2.0-dev (>= 2.30.0),
libpango1.0-dev (>= 1.37.3),
libatk1.0-dev (>= 2.15.1),
@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9.20141010),
libepoxy-dev,
libharfbuzz-dev (>= 0.9),
libwayland-dev (>= 1.9.91) [linux-any],
wayland-protocols (>= 1.3) [linux-any],
wayland-protocols (>= 1.6) [linux-any],
libxkbcommon-dev (>= 0.2.0),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),

31
debian/libgtk-3-0.symbols vendored
View File

@ -2,6 +2,7 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
* Build-Depends-Package: libgtk-3-dev
gdk__private__@Base 3.16.2
gdk_add_option_entries_libgtk_only@Base 3.0.0
gdk_anchor_hints_get_type@Base 3.21.5
gdk_app_launch_context_get_type@Base 3.0.0
gdk_app_launch_context_new@Base 3.0.0
gdk_app_launch_context_set_desktop@Base 3.0.0
@ -92,9 +93,16 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
gdk_device_manager_get_display@Base 3.0.0
gdk_device_manager_get_type@Base 3.0.0
gdk_device_manager_list_devices@Base 3.0.0
gdk_device_pad_feature_get_type@Base 3.21.5
gdk_device_pad_get_feature_group@Base 3.21.5
gdk_device_pad_get_group_n_modes@Base 3.21.5
gdk_device_pad_get_n_features@Base 3.21.5
gdk_device_pad_get_n_groups@Base 3.21.5
gdk_device_pad_get_type@Base 3.21.5
gdk_device_set_axis_use@Base 3.0.0
gdk_device_set_key@Base 3.0.0
gdk_device_set_mode@Base 3.0.0
gdk_device_tool_get_hardware_id@Base 3.21.5
gdk_device_tool_get_serial@Base 3.21.4
gdk_device_tool_get_tool_type@Base 3.21.4
gdk_device_tool_get_type@Base 3.21.4
@ -470,14 +478,16 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
gdk_visual_get_type@Base 3.0.0
gdk_visual_get_visual_type@Base 3.0.0
gdk_visual_type_get_type@Base 3.0.0
gdk_wayland_device_get_node_path@Base 3.21.5
(arch=linux-any)gdk_wayland_device_get_type@Base 3.9.10
(arch=linux-any)gdk_wayland_device_get_wl_keyboard@Base 3.9.10
(arch=linux-any)gdk_wayland_device_get_wl_pointer@Base 3.9.10
(arch=linux-any)gdk_wayland_device_get_wl_seat@Base 3.9.10
gdk_wayland_device_pad_set_feedback@Base 3.21.5
(arch=linux-any)gdk_wayland_display_get_type@Base 3.9.10
(arch=linux-any)gdk_wayland_display_get_wl_compositor@Base 3.9.10
(arch=linux-any)gdk_wayland_display_get_wl_display@Base 3.9.10
(arch=linux-any)gdk_wayland_display_get_xdg_shell@Base 3.11.5
#MISSING: 3.21.5-1# (arch=linux-any)gdk_wayland_display_get_xdg_shell@Base 3.11.5
(arch=linux-any)gdk_wayland_display_set_cursor_theme@Base 3.9.10
(arch=linux-any)gdk_wayland_gl_context_get_type@Base 3.16.2
(arch=linux-any)gdk_wayland_monitor_get_type@Base 3.21.4
@ -485,10 +495,13 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
(arch=linux-any)gdk_wayland_seat_get_wl_seat@Base 3.19.12
(arch=linux-any)gdk_wayland_selection_add_targets_libgtk_only@Base 3.13.8
(arch=linux-any)gdk_wayland_selection_clear_targets_libgtk_only@Base 3.13.8
gdk_wayland_window_export_handle@Base 3.21.5
(arch=linux-any)gdk_wayland_window_get_type@Base 3.9.10
(arch=linux-any)gdk_wayland_window_get_wl_surface@Base 3.9.10
(arch=linux-any)gdk_wayland_window_set_dbus_properties_libgtk_only@Base 3.10.0
gdk_wayland_window_set_transient_for_exported@Base 3.21.5
(arch=linux-any)gdk_wayland_window_set_use_custom_surface@Base 3.9.10
gdk_wayland_window_unexport_handle@Base 3.21.5
gdk_window_add_filter@Base 3.0.0
gdk_window_at_pointer@Base 3.0.0
gdk_window_attributes_type_get_type@Base 3.0.0
@ -2674,6 +2687,9 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
gtk_menu_place_on_monitor@Base 3.21.4
gtk_menu_popdown@Base 3.0.0
gtk_menu_popup@Base 3.0.0
gtk_menu_popup_at_pointer@Base 3.21.5
gtk_menu_popup_at_rect@Base 3.21.5
gtk_menu_popup_at_widget@Base 3.21.5
gtk_menu_popup_for_device@Base 3.0.0
gtk_menu_reorder_child@Base 3.0.0
gtk_menu_reposition@Base 3.0.0
@ -2826,6 +2842,11 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
gtk_overlay_set_overlay_pass_through@Base 3.17.9
gtk_pack_direction_get_type@Base 3.0.0
gtk_pack_type_get_type@Base 3.0.0
gtk_pad_action_type_get_type@Base 3.21.5
gtk_pad_controller_get_type@Base 3.21.5
gtk_pad_controller_new@Base 3.21.5
gtk_pad_controller_set_action@Base 3.21.5
gtk_pad_controller_set_action_entries@Base 3.21.5
gtk_page_orientation_get_type@Base 3.0.0
gtk_page_set_get_type@Base 3.0.0
gtk_page_setup_copy@Base 3.0.0
@ -2978,6 +2999,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
gtk_popover_menu_open_submenu@Base 3.16.2
gtk_popover_new@Base 3.11.5
gtk_popover_new_from_model@Base 3.11.7
gtk_popover_popdown@Base 3.21.5
gtk_popover_popup@Base 3.21.5
gtk_popover_set_constrain_to@Base 3.19.12
gtk_popover_set_default_widget@Base 3.17.9
gtk_popover_set_modal@Base 3.11.5
@ -3643,6 +3666,12 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
gtk_settings_set_property_value@Base 3.0.0
gtk_settings_set_string_property@Base 3.0.0
gtk_shadow_type_get_type@Base 3.0.0
gtk_shortcut_label_get_accelerator@Base 3.21.5
gtk_shortcut_label_get_disabled_text@Base 3.21.5
gtk_shortcut_label_get_type@Base 3.21.5
gtk_shortcut_label_new@Base 3.21.5
gtk_shortcut_label_set_accelerator@Base 3.21.5
gtk_shortcut_label_set_disabled_text@Base 3.21.5
gtk_shortcut_type_get_type@Base 3.19.12
gtk_shortcuts_group_get_type@Base 3.19.12
gtk_shortcuts_section_get_type@Base 3.19.12

75
debian/patches/Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch vendored
View File

@ -1,75 +0,0 @@
From: Simon McVittie <smcv@debian.org>
Date: Mon, 6 Jun 2016 09:48:36 +0100
Subject: Don't apply GDK_HINT_RESIZE_INC to GDK_WINDOW_STATE_TILED
windows
This matches the behaviour of Mutter, Metacity and traditional X11
window managers on the window manager side, and is what we want
for at least gnome-terminal. I can't think of any reason why we'd
want incremental resize in any other tiled window.
Signed-off-by: Simon McVittie <smcv@debian.org>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=755947
Forwarded: yes
---
gdk/wayland/gdkwindow-wayland.c | 10 +++++-----
gtk/gtkwindow.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index cd71c04..c705d8d 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1215,7 +1215,7 @@ xdg_surface_configure (void *data,
GdkWindow *window = GDK_WINDOW (data);
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkWindowState new_state = 0;
- gboolean maximized_or_fullscreen;
+ gboolean fixed_size;
uint32_t *p;
wl_array_for_each (p, states)
@@ -1244,8 +1244,8 @@ xdg_surface_configure (void *data,
}
}
- maximized_or_fullscreen =
- new_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN);
+ fixed_size =
+ new_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN | GDK_WINDOW_STATE_TILED);
/* According to xdg_shell, an xdg_surface.configure with size 0x0
* should be interpreted as that it is up to the client to set a
@@ -1255,7 +1255,7 @@ xdg_surface_configure (void *data,
* the client should configure its size back to what it was before
* being maximize or fullscreen.
*/
- if (width == 0 && height == 0 && !maximized_or_fullscreen)
+ if (width == 0 && height == 0 && !fixed_size)
{
width = impl->saved_width;
height = impl->saved_height;
@@ -1266,7 +1266,7 @@ xdg_surface_configure (void *data,
GdkWindowHints geometry_mask = impl->geometry_mask;
/* Ignore size increments for maximized/fullscreen windows */
- if (maximized_or_fullscreen)
+ if (fixed_size)
geometry_mask &= ~GDK_HINT_RESIZE_INC;
gdk_window_constrain_size (&impl->geometry_hints,
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b19a643..df1892a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9939,8 +9939,8 @@ gtk_window_constrain_size (GtkWindow *window,
GtkWindowPrivate *priv = window->priv;
guint geometry_flags;
- /* ignore size increments for maximized/fullscreen windows */
- if (priv->maximized || priv->fullscreen)
+ /* ignore size increments for windows that fit in a fixed space */
+ if (priv->maximized || priv->fullscreen || priv->tiled)
geometry_flags = flags & ~GDK_HINT_RESIZE_INC;
else
geometry_flags = flags;

4
debian/patches/no-accessibility-dump.patch vendored
View File

@ -8,8 +8,8 @@ for installed-tests.
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -28,7 +28,7 @@
GTK_CSD=1 \
@@ -29,7 +29,7 @@
GDK_BACKEND=x11 \
G_ENABLE_DIAGNOSTIC=0
-TEST_PROGS += accessibility-dump

1
debian/patches/series vendored
View File

@ -7,5 +7,4 @@
071_fix-installation-of-HTML-images.patch
no-accessibility-dump.patch
reftest-known-fail.patch
Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch
0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch