Title: [128905] trunk/Source/WebCore
- Revision
- 128905
- Author
- [email protected]
- Date
- 2012-09-18 10:43:06 -0700 (Tue, 18 Sep 2012)
Log Message
[GTK] Build is broken without option --enable-unstable-features
https://bugs.webkit.org/show_bug.cgi?id=96996
Reviewed by Martin Robinson.
When searching for the bare feature define in feature_defines_unstable or
feature_defines_overrides, search for the bare define followed by = character.
This avoids incorrectly matching the ENABLE_VIDEO define to the ENABLE_VIDEO_TRACK
overriding define (and works as well for other similarly named feature defines).
No new tests - no new functionality.
* GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128904 => 128905)
--- trunk/Source/WebCore/ChangeLog 2012-09-18 17:42:07 UTC (rev 128904)
+++ trunk/Source/WebCore/ChangeLog 2012-09-18 17:43:06 UTC (rev 128905)
@@ -1,3 +1,19 @@
+2012-09-18 Zan Dobersek <[email protected]>
+
+ [GTK] Build is broken without option --enable-unstable-features
+ https://bugs.webkit.org/show_bug.cgi?id=96996
+
+ Reviewed by Martin Robinson.
+
+ When searching for the bare feature define in feature_defines_unstable or
+ feature_defines_overrides, search for the bare define followed by = character.
+ This avoids incorrectly matching the ENABLE_VIDEO define to the ENABLE_VIDEO_TRACK
+ overriding define (and works as well for other similarly named feature defines).
+
+ No new tests - no new functionality.
+
+ * GNUmakefile.am:
+
2012-09-18 Andrey Kosyakov <[email protected]>
Web Inspector: [Extensions API] postpone requests to add extensions until extension server is initialized
Modified: trunk/Source/WebCore/GNUmakefile.am (128904 => 128905)
--- trunk/Source/WebCore/GNUmakefile.am 2012-09-18 17:42:07 UTC (rev 128904)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-09-18 17:43:06 UTC (rev 128905)
@@ -365,9 +365,9 @@
$(if $(findstring =$(fvalue),$(define)),$(patsubst %=$(fvalue),%,$(define))) \
) \
), \
- $(if $(findstring $(bare_define), $(feature_defines_unstable)), \
+ $(if $(findstring $(bare_define)=, $(feature_defines_unstable)), \
$(filter $(bare_define)=%,$(feature_defines_unstable)), \
- $(if $(findstring $(bare_define), $(feature_defines_overrides)), \
+ $(if $(findstring $(bare_define)=, $(feature_defines_overrides)), \
$(filter $(bare_define)=%,$(feature_defines_overrides)), \
$(filter $(bare_define)=%,$(feature_defines_defaults)) \
) \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
