Attachment 369570 Details for Bug 197784 – Patch for landing

[patch] Patch for landing

bug-197784-20190510190409.patch (text/plain), 1.41 KB, created by Charlie Turner on 2019-05-10 11:04:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Turner

Created: 2019-05-10 11:04:10 PDT

Size: 1.41 KB

patch

obsolete

>Subversion Revision: 245171
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 6967cbafac8cc75630461a38105661f2ec617f79..7f7049308463eb62afe91bbe1dadee282e8b6f69 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-10  Charlie Turner  <cturner@igalia.com>
>+
>+        [WPE] Forward libepoxy cflags
>+        https://bugs.webkit.org/show_bug.cgi?id=197784
>+
>+        Reviewed by Å½an DoberÅ¡ek.
>+
>+        Patch by Zan Dobersek.
>+
>+        * wpe/backends/CMakeLists.txt: This is required to keep
>+        -DMESA_EGL_NO_X11_HEADERS in the build, if we don't do this, EGL ends
>+        up trying to include X11 headers even when they're not present in the
>+        environment.
>+
> 2019-05-09  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         WinCairo WebKitTestRunner should take platform/wk2/TestExpectations into account
>diff --git a/Tools/wpe/backends/CMakeLists.txt b/Tools/wpe/backends/CMakeLists.txt
>index f6a17084525390318e8ad5b63c7830ea1849c0ee..98f46ee213bba0825afd10afcd7ed84126fc18db 100644
>--- a/Tools/wpe/backends/CMakeLists.txt
>+++ b/Tools/wpe/backends/CMakeLists.txt
>@@ -36,6 +36,8 @@ set(WPEToolingBackends_LIBRARIES
>     ${WPEBACKEND_FDO_LIBRARIES}
> )
> 
>+add_definitions(${LIBEPOXY_DEFINITIONS})
>+
> add_custom_command(
>     OUTPUT ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-protocol.c
>     MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml

Actions: View | Formatted Diff | Diff

Attachments on bug 197784: 369562 | 369566 | 369570