]> Pileus Git - ~andy/gtk/commitdiff
docs: Disable GtkPlug/GtkSocket docs on Wayland
authorBastien Nocera <hadess@hadess.net>
Tue, 12 Mar 2013 07:33:57 +0000 (08:33 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 12 Mar 2013 11:20:18 +0000 (07:20 -0400)
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
docs/reference/gtk/gtk3.types.in

index b90df725570a9999d280d217ee4328fce40898f0..91e7da02d8335d288a6769590293ac5bc099fdf5 100644 (file)
@@ -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#* }
index 3f378b3b226de2e6807097ede58a360bc4201319..0dcb1ea1ecffc300e5cb3d9308b6698e2594c6ed 100644 (file)
@@ -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