Attachment 255713 Details for Bug 146390 – Patch

[patch] Patch

bug-146390-20150627180127.patch (text/plain), 1.44 KB, created by Philip Chimento on 2015-06-27 18:02:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Chimento

Created: 2015-06-27 18:02:05 PDT

Size: 1.44 KB

patch

obsolete

>Subversion Revision: 186035
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index e23e153bd78f923a397027011dc4dedd7c71b3e8..40fbc05b3ffc1b8c3cfc673e12c05eebf5aadac9 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -116,8 +116,8 @@ if (OPENGL_FOUND)
>     if (EGL_FOUND)
>         list(APPEND CAIROGL_COMPONENTS cairo-egl)
>     endif ()
>-    find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
> endif ()
>+find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
> 
> # Normally we do not set the value of options automatically. However, CairoGL is special. Currently
> # most major distros compile Cario with --enable-gl, but Debian and derivitives are a major
>diff --git a/ChangeLog b/ChangeLog
>index f997fec2b165bc35bd347f2e83e5e6be30dcd477..d8404cae936664e0da00ff6ac7a52237e7cd13f6 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-06-27  Philip Chimento  <philip.chimento@gmail.com>
>+
>+        CairoGL should be checked unconditionally
>+        https://bugs.webkit.org/show_bug.cgi?id=146390
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsGTK.cmake: Move check for CairoGL so that
>+        it is run unconditionally; this is necessary because its result
>+        is used later on, outside of any conditions.
>+
> 2015-06-27  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK][SOUP] Implement WebCore::PublicSuffix for soup and enable PUBLIC_SUFFIX_LIST for GTK+

Actions: View | Formatted Diff | Diff

Attachments on bug 146390: 255713