From d1de6c322b96d100ae37be92b5d5890897190661 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Mar 2013 08:33:57 +0100 Subject: [PATCH] docs: Disable GtkPlug/GtkSocket docs on Wayland As those two types do not exist in the Wayland backend, and the docs build would fail. https://bugzilla.gnome.org/show_bug.cgi?id=695682 --- configure.ac | 3 +++ docs/reference/gtk/gtk3.types.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b90df7255..91e7da02d 100644 --- a/configure.ac +++ b/configure.ac @@ -390,6 +390,7 @@ else AM_CONDITIONAL(USE_BROADWAY, false) fi +DISABLE_ON_WAYLAND='' if test "x$enable_wayland_backend" = "xyes"; then # For the cairo image backend cairo_backends="$cairo_backends cairo" @@ -397,11 +398,13 @@ if test "x$enable_wayland_backend" = "xyes"; then have_gio_unix=yes GDK_WINDOWING="$GDK_WINDOWING #define GDK_WINDOWING_WAYLAND" + DISABLE_ON_WAYLAND='%' WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor" AM_CONDITIONAL(USE_WAYLAND, true) else AM_CONDITIONAL(USE_WAYLAND, false) fi +AC_SUBST(DISABLE_ON_WAYLAND) # strip leading space GDK_BACKENDS=${GDK_BACKENDS#* } diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in index 3f378b3b2..0dcb1ea1e 100644 --- a/docs/reference/gtk/gtk3.types.in +++ b/docs/reference/gtk/gtk3.types.in @@ -119,7 +119,7 @@ gtk_page_setup_get_type @DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type gtk_paned_get_type gtk_paper_size_get_type -@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_plug_get_type +@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_plug_get_type @DISABLE_ON_W32@gtk_printer_get_type gtk_print_context_get_type @DISABLE_ON_W32@gtk_print_job_get_type @@ -151,7 +151,7 @@ gtk_separator_menu_item_get_type gtk_separator_tool_item_get_type gtk_settings_get_type gtk_size_group_get_type -@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_socket_get_type +@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_socket_get_type gtk_spin_button_get_type gtk_spinner_get_type gtk_statusbar_get_type -- 2.43.2