| Differences between
and this patch
- a/Source/cmake/OptionsGTK.cmake -12 / +14 lines
Lines 33-38 set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") a/Source/cmake/OptionsGTK.cmake_sec1
33
find_package(Cairo 1.10.2 REQUIRED)
33
find_package(Cairo 1.10.2 REQUIRED)
34
find_package(Fontconfig 2.8.0 REQUIRED)
34
find_package(Fontconfig 2.8.0 REQUIRED)
35
find_package(Freetype2 2.4.2 REQUIRED)
35
find_package(Freetype2 2.4.2 REQUIRED)
36
find_package(GTK3 3.6.0 REQUIRED)
37
find_package(GDK3 3.6.0 REQUIRED)
36
find_package(HarfBuzz 0.9.2 REQUIRED)
38
find_package(HarfBuzz 0.9.2 REQUIRED)
37
find_package(ICU REQUIRED)
39
find_package(ICU REQUIRED)
38
find_package(JPEG REQUIRED)
40
find_package(JPEG REQUIRED)
Lines 47-52 find_package(ATK REQUIRED) a/Source/cmake/OptionsGTK.cmake_sec2
47
find_package(WebP REQUIRED)
49
find_package(WebP REQUIRED)
48
find_package(ATSPI 2.5.3)
50
find_package(ATSPI 2.5.3)
49
find_package(EGL)
51
find_package(EGL)
52
find_package(GTKUnixPrint)
50
find_package(OpenGL)
53
find_package(OpenGL)
51
find_package(OpenGLES2)
54
find_package(OpenGLES2)
52
55
Lines 63-75 if (NOT OPENGL_FOUND AND OPENGLES2_FOUND) a/Source/cmake/OptionsGTK.cmake_sec3
63
    set(ENABLE_GLES2_DEFAULT ON)
66
    set(ENABLE_GLES2_DEFAULT ON)
64
endif ()
67
endif ()
65
68
69
# Similarly, we autodetect which GDK backends to support, since there is
70
# basically no way this could ever result in an undesired configuration.
71
set(ENABLE_X11_TARGET_DEFAULT ${GTK3_SUPPORTS_X11})
72
set(ENABLE_WAYLAND_TARGET_DEFAULT ${GTK3_SUPPORTS_WAYLAND})
73
66
WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
74
WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
67
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
75
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
68
WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
76
WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
69
WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
77
WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
70
WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
78
WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
71
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
79
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ENABLE_X11_TARGET_DEFAULT)
72
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
80
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ENABLE_WAYLAND_TARGET_DEFAULT)
73
WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
81
WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
74
WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
82
WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
75
83
Lines 224-239 add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=602) a/Source/cmake/OptionsGTK.cmake_sec4
224
add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
232
add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
225
add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
233
add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
226
234
227
if (ENABLE_WAYLAND_TARGET)
228
    set(GTK3_REQUIRED_VERSION 3.12.0)
229
else ()
230
    set(GTK3_REQUIRED_VERSION 3.6.0)
231
endif ()
232
233
find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
234
find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
235
find_package(GTKUnixPrint)
236
237
set(GTK_LIBRARIES ${GTK3_LIBRARIES})
235
set(GTK_LIBRARIES ${GTK3_LIBRARIES})
238
set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
236
set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
239
set(GDK_LIBRARIES ${GDK3_LIBRARIES})
237
set(GDK_LIBRARIES ${GDK3_LIBRARIES})
Lines 424-429 if (ENABLE_WAYLAND_TARGET) a/Source/cmake/OptionsGTK.cmake_sec5
424
        message(FATAL_ERROR "Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET")
422
        message(FATAL_ERROR "Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET")
425
    endif ()
423
    endif ()
426
424
425
    if (ENABLE_WAYLAND_TARGET AND GTK3_VERSION VERSION_LESS 3.12)
426
        message(FATAL_ERROR "GTK+ 3.12 is required to use ENABLE_WAYLAND_TARGET")
427
    endif ()
428
427
    find_package(Wayland REQUIRED)
429
    find_package(Wayland REQUIRED)
428
endif ()
430
endif ()
429
431
- a/ChangeLog +13 lines
Lines 1-3 a/ChangeLog_sec1
1
2015-08-25  Michael Catanzaro  <mcatanzaro@igalia.com>
2
3
        [GTK] r186800 broke the build on Ubuntu 14.04
4
        https://bugs.webkit.org/show_bug.cgi?id=147559
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Autodetect support for X11 and Wayland backends based on the backends
9
        that GTK+ was compiled with. This is a convenience for Ubuntu users,
10
        which does not compile the GDK Wayland backend.
11
12
        * Source/cmake/OptionsGTK.cmake:
13
1
2015-08-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
14
2015-08-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
2
15
3
        [GTK] Auto-detection of cairo-gl fails
16
        [GTK] Auto-detection of cairo-gl fails

Return to Bug 147559