Attachment 357697 Details for Bug 192865 – Patch

[patch] Patch

bug-192865-20181219211555.patch (text/plain), 1.78 KB, created by Adrian Perez on 2018-12-19 11:15:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2018-12-19 11:15:56 PST

Size: 1.78 KB

patch

obsolete

>Subversion Revision: 239380
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 91b0936540979192c6cfdd11db04ab1ec4d4c89a..ca6eeee66f5dc3acc38204d9e4268aafe20cdc06 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -126,10 +126,10 @@ else ()
> endif ()
> 
> # Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
>-if ("${PC_CAIRO_VERSION}" VERSION_GREATER_EQUAL "1.16.0"
>-    AND "${PC_FONTCONFIG_VERSION}" VERSION_GREATER_EQUAL "2.13.0"
>-    AND "${FREETYPE_VERSION_STRING}" VERSION_GREATER_EQUAL "2.9.0"
>-    AND "${PC_HARFBUZZ_VERSION}" VERSION_GREATER_EQUAL "1.4.2")
>+if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
>+    AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
>+    AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
>+    AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
> endif ()
> 
>diff --git a/ChangeLog b/ChangeLog
>index 938b34cde9c39fb31fa0610f3182e9961adfc7b8..46374de949e7d5f3a6f49ec11afef7182277b224 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-12-19  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [GTK] Cannot build with CMake <3.7
>+        https://bugs.webkit.org/show_bug.cgi?id=192865
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsGTK.cmake: Convert usage of VERSION_GREATER_EQUAL to a
>+        combination of VERSION_GREATER + STREQUAL.
>+
> 2018-12-19  Lucas Stach  <l.stach@pengutronix.de>
> 
>         Fix build on 64bit ARM with arm64 SYSTEM_PROCESSOR

Actions: View | Formatted Diff | Diff

Attachments on bug 192865: 357697