Attachment 259851 Details for Bug 147559 – Patch

[patch] Patch

bug-147559-20150825110855.patch (text/plain), 4.07 KB, created by Michael Catanzaro on 2015-08-25 09:09:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2015-08-25 09:09:05 PDT

Size: 4.07 KB

patch

obsolete

>Subversion Revision: 188865
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 6267bff84ea12cb3e50b33363a0a2f08fc55be89..4d92c83df36adb39d1c2181b7d05dcf8f5e1d94b 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -33,6 +33,8 @@ set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
> find_package(Cairo 1.10.2 REQUIRED)
> find_package(Fontconfig 2.8.0 REQUIRED)
> find_package(Freetype2 2.4.2 REQUIRED)
>+find_package(GTK3 3.6.0 REQUIRED)
>+find_package(GDK3 3.6.0 REQUIRED)
> find_package(HarfBuzz 0.9.2 REQUIRED)
> find_package(ICU REQUIRED)
> find_package(JPEG REQUIRED)
>@@ -47,6 +49,7 @@ find_package(ATK REQUIRED)
> find_package(WebP REQUIRED)
> find_package(ATSPI 2.5.3)
> find_package(EGL)
>+find_package(GTKUnixPrint)
> find_package(OpenGL)
> find_package(OpenGLES2)
> 
>@@ -63,13 +66,18 @@ if (NOT OPENGL_FOUND AND OPENGLES2_FOUND)
>     set(ENABLE_GLES2_DEFAULT ON)
> endif ()
> 
>+# Similarly, we autodetect which GDK backends to support, since there is
>+# basically no way this could ever result in an undesired configuration.
>+set(ENABLE_X11_TARGET_DEFAULT ${GTK3_SUPPORTS_X11})
>+set(ENABLE_WAYLAND_TARGET_DEFAULT ${GTK3_SUPPORTS_WAYLAND})
>+
> WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
> WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
> WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
> WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
>-WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
>-WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
>+WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ENABLE_X11_TARGET_DEFAULT)
>+WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ENABLE_WAYLAND_TARGET_DEFAULT)
> WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
> WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
> 
>@@ -224,16 +232,6 @@ add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=602)
> add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
> add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
> 
>-if (ENABLE_WAYLAND_TARGET)
>-    set(GTK3_REQUIRED_VERSION 3.12.0)
>-else ()
>-    set(GTK3_REQUIRED_VERSION 3.6.0)
>-endif ()
>-
>-find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
>-find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
>-find_package(GTKUnixPrint)
>-
> set(GTK_LIBRARIES ${GTK3_LIBRARIES})
> set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
> set(GDK_LIBRARIES ${GDK3_LIBRARIES})
>@@ -424,6 +422,10 @@ if (ENABLE_WAYLAND_TARGET)
>         message(FATAL_ERROR "Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET")
>     endif ()
> 
>+    if (ENABLE_WAYLAND_TARGET AND GTK3_VERSION VERSION_LESS 3.12)
>+        message(FATAL_ERROR "GTK+ 3.12 is required to use ENABLE_WAYLAND_TARGET")
>+    endif ()
>+
>     find_package(Wayland REQUIRED)
> endif ()
> 
>diff --git a/ChangeLog b/ChangeLog
>index a330e2598c112fbb6413523faffb83dc5c3c04e7..8324cd0c2d1518edadd9a5547bab617394f837fb 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,16 @@
>+2015-08-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK] r186800 broke the build on Ubuntu 14.04
>+        https://bugs.webkit.org/show_bug.cgi?id=147559
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Autodetect support for X11 and Wayland backends based on the backends
>+        that GTK+ was compiled with. This is a convenience for Ubuntu users,
>+        which does not compile the GDK Wayland backend.
>+
>+        * Source/cmake/OptionsGTK.cmake:
>+
> 2015-08-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
> 
>         [GTK] Auto-detection of cairo-gl fails

Actions: View | Formatted Diff | Diff

Attachments on bug 147559: 259760 | 259851 | 259853