[webkit-changes] [191343] trunk/Source

Tue, 20 Oct 2015 09:41:49 -0700

Title: [191343] trunk/Source

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191342 => 191343)


--- trunk/Source/_javascript_Core/ChangeLog	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-20 16:41:15 UTC (rev 191343)
@@ -1,3 +1,9 @@
+2015-10-20  Tim Horton  <[email protected]>
+
+        Try to fix the build by disabling MAC_GESTURE_EVENTS on 10.9 and 10.10
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-10-20  Xabier Rodriguez Calvar  <[email protected]>
 
         [Streams API] Rework some readable stream internals that can be common to writable streams

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (191342 => 191343)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-10-20 16:41:15 UTC (rev 191343)
@@ -125,8 +125,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: trunk/Source/WebCore/ChangeLog (191342 => 191343)


--- trunk/Source/WebCore/ChangeLog	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebCore/ChangeLog	2015-10-20 16:41:15 UTC (rev 191343)
@@ -1,3 +1,9 @@
+2015-10-20  Tim Horton  <[email protected]>
+
+        Try to fix the build by disabling MAC_GESTURE_EVENTS on 10.9 and 10.10
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-10-13  Sergio Villar Senin  <[email protected]>
 
         ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (191342 => 191343)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-10-20 16:41:15 UTC (rev 191343)
@@ -125,8 +125,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: trunk/Source/WebKit/mac/ChangeLog (191342 => 191343)


--- trunk/Source/WebKit/mac/ChangeLog	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-10-20 16:41:15 UTC (rev 191343)
@@ -1,3 +1,9 @@
+2015-10-20  Tim Horton  <[email protected]>
+
+        Try to fix the build by disabling MAC_GESTURE_EVENTS on 10.9 and 10.10
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-10-20  Yoav Weiss  <[email protected]>
 
         Rename the PICTURE_SIZES flag to CURRENTSRC

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (191342 => 191343)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-10-20 16:41:15 UTC (rev 191343)
@@ -125,8 +125,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: trunk/Source/WebKit2/ChangeLog (191342 => 191343)


--- trunk/Source/WebKit2/ChangeLog	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-20 16:41:15 UTC (rev 191343)
@@ -1,3 +1,9 @@
+2015-10-20  Tim Horton  <[email protected]>
+
+        Try to fix the build by disabling MAC_GESTURE_EVENTS on 10.9 and 10.10
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-10-20  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r191333.

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (191342 => 191343)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-10-20 16:02:48 UTC (rev 191342)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-10-20 16:41:15 UTC (rev 191343)
@@ -125,8 +125,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to