Title: [233914] trunk/Tools
Revision
233914
Author
ctur...@igalia.com
Date
2018-07-18 09:04:33 -0700 (Wed, 18 Jul 2018)

Log Message

[WPE] Update WPEBackend in flatpak
https://bugs.webkit.org/show_bug.cgi?id=187753

r233763 updated WPEBackend for the jhbuild, but not the flatpak. This
caused WPE_BACKEND_CHECK_VERSION to not be defined, triggering a bug
in the version guard,

#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)

This doesn't work as intended, since the C preprocessor first expands
all macro arguments in the #if _expression_ before evaluating the
_expression_. When WPE_BACKEND_CHECK_VERSION is not defined, this will
lead to a syntax error and some head scratching.

A future patch should address the buggy macro check, when it is
decided whether the assume the macro is always defined and bump
the API requirements on WPEBackend, or to move the check into two
conditionals to avoid the expansion problem.

Unreviewed build fix.


* flatpak/org.webkit.WPE.yaml:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (233913 => 233914)


--- trunk/Tools/ChangeLog	2018-07-18 15:55:33 UTC (rev 233913)
+++ trunk/Tools/ChangeLog	2018-07-18 16:04:33 UTC (rev 233914)
@@ -1,3 +1,28 @@
+2018-07-18  Charlie Turner  <ctur...@igalia.com>
+
+        [WPE] Update WPEBackend in flatpak
+        https://bugs.webkit.org/show_bug.cgi?id=187753
+
+        r233763 updated WPEBackend for the jhbuild, but not the flatpak. This
+        caused WPE_BACKEND_CHECK_VERSION to not be defined, triggering a bug
+        in the version guard,
+
+        #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
+
+        This doesn't work as intended, since the C preprocessor first expands
+        all macro arguments in the #if _expression_ before evaluating the
+        _expression_. When WPE_BACKEND_CHECK_VERSION is not defined, this will
+        lead to a syntax error and some head scratching.
+
+        A future patch should address the buggy macro check, when it is
+        decided whether the assume the macro is always defined and bump
+        the API requirements on WPEBackend, or to move the check into two
+        conditionals to avoid the expansion problem.
+
+        Unreviewed build fix.
+        
+        * flatpak/org.webkit.WPE.yaml:
+
 2018-07-18  Simon Fraser  <simon.fra...@apple.com>
 
         Fix the parsing of colors in attributed string tests, and make it possible to dump the typing attributes

Modified: trunk/Tools/flatpak/org.webkit.WPE.yaml (233913 => 233914)


--- trunk/Tools/flatpak/org.webkit.WPE.yaml	2018-07-18 15:55:33 UTC (rev 233913)
+++ trunk/Tools/flatpak/org.webkit.WPE.yaml	2018-07-18 16:04:33 UTC (rev 233914)
@@ -3,7 +3,7 @@
   sources:
     - type: git
       url: https://github.com/WebPlatformForEmbedded/WPEBackend.git
-      branch: 761496dff51b6962200294b4fe2bc9529da731a8
+      branch: 411decf4875e7a5c858489206cdb7705a4bbb581
 - name: wpebackend-fdo
   buildsystem: cmake-ninja
   sources:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to