diff --git a/debian/changelog b/debian/changelog index 84d02a1c2a..f3cda1daed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,12 @@ gtk+3.0 (3.9.10-1) UNRELEASED; urgency=low gdk_offscreen_window_get_type, gdk_window_impl_get_type, gdk_window_impl_x11_get_type. - + * Explicitly set which GDK backends to build: + - enable x11,wayland,broadway in regular build + - disable wayland,broadway and enable x11 in udeb build + * Add build-dependencies needed by wayland backend: + - libwayland-dev (>= 1.1.90), libxkbcommon-dev (>= 0.2.0) + * Update debian/libgtk-3-0.symbols with added broadway & wayland symbols. -- Andreas Henriksson Tue, 06 Aug 2013 12:59:11 +0200 diff --git a/debian/control.in b/debian/control.in index 66a9b16d6d..1a9c12705b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 8.1.3), libpango1.0-dev (>= 1.32.4), libatk1.0-dev (>= 2.7.5), libatk-bridge2.0-dev, + libwayland-dev (>= 1.1.90), + libxkbcommon-dev (>= 0.2.0), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), libxi-dev (>= 2:1.3-4), diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols index 6a9b60dc81..7bb8c33237 100644 --- a/debian/libgtk-3-0.symbols +++ b/debian/libgtk-3-0.symbols @@ -14,6 +14,10 @@ libgdk-3.so.0 libgtk-3-0 #MINVER# gdk_atom_name@Base 3.0.0 gdk_axis_use_get_type@Base 3.0.0 gdk_beep@Base 3.0.0 + gdk_broadway_cursor_get_type@Base 3.9.10 + gdk_broadway_get_last_seen_time@Base 3.9.10 + gdk_broadway_visual_get_type@Base 3.9.10 + gdk_broadway_window_get_type@Base 3.9.10 gdk_byte_order_get_type@Base 3.0.0 gdk_cairo_create@Base 3.0.0 gdk_cairo_get_clip_rectangle@Base 3.0.0 @@ -376,6 +380,23 @@ 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_clear_selection_content_libgtk_only@Base 3.9.10 + gdk_wayland_device_get_selection_type_atoms_libgtk_only@Base 3.9.10 + gdk_wayland_device_get_type@Base 3.9.10 + gdk_wayland_device_get_wl_keyboard@Base 3.9.10 + gdk_wayland_device_get_wl_pointer@Base 3.9.10 + gdk_wayland_device_get_wl_seat@Base 3.9.10 + gdk_wayland_device_offer_selection_content_libgtk_only@Base 3.9.10 + gdk_wayland_device_request_selection_content_libgtk_only@Base 3.9.10 + gdk_wayland_display_get_type@Base 3.9.10 + gdk_wayland_display_get_wl_compositor@Base 3.9.10 + gdk_wayland_display_get_wl_display@Base 3.9.10 + gdk_wayland_display_get_wl_shell@Base 3.9.10 + gdk_wayland_display_set_cursor_theme@Base 3.9.10 + gdk_wayland_window_get_type@Base 3.9.10 + gdk_wayland_window_get_wl_shell_surface@Base 3.9.10 + gdk_wayland_window_get_wl_surface@Base 3.9.10 + gdk_wayland_window_set_use_custom_surface@Base 3.9.10 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 diff --git a/debian/rules b/debian/rules index b89675d349..9b39a115a8 100644 --- a/debian/rules +++ b/debian/rules @@ -62,6 +62,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = \ --enable-test-print-backend DEB_CONFIGURE_FLAGS_shared = \ + --enable-broadway-backend \ + --enable-wayland-backend \ + --enable-x11-backend \ --enable-gtk-doc \ --enable-shared \ --enable-introspection \ @@ -69,6 +72,9 @@ DEB_CONFIGURE_FLAGS_shared = \ --disable-static DEB_CONFIGURE_FLAGS_shared_udeb = \ + --disable-broadway-backend \ + --disable-wayland-backend \ + --enable-x11-backend \ --disable-introspection \ --disable-colord \ --disable-xcomposite \