[webkit-changes] [194233] branches/safari-601-branch/Source

Thu, 17 Dec 2015 14:14:05 -0800

Title: [194233] branches/safari-601-branch/Source

Diff

Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (194232 => 194233)


--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2015-12-17 22:13:51 UTC (rev 194233)
@@ -1,5 +1,15 @@
 2015-12-17  Babak Shafiei  <[email protected]>
 
+        Merge r191343.
+
+    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-12-17  Babak Shafiei  <[email protected]>
+
         Merge r191305.
 
     2015-10-19  Tim Horton  <[email protected]>

Modified: branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (194232 => 194233)


--- branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:51 UTC (rev 194233)
@@ -123,8 +123,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: branches/safari-601-branch/Source/WebCore/ChangeLog (194232 => 194233)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-17 22:13:51 UTC (rev 194233)
@@ -1,5 +1,15 @@
 2015-12-17  Babak Shafiei  <[email protected]>
 
+        Merge r191343.
+
+    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-12-17  Babak Shafiei  <[email protected]>
+
         Merge r191305.
 
     2015-10-19  Tim Horton  <[email protected]>

Modified: branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (194232 => 194233)


--- branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:51 UTC (rev 194233)
@@ -123,8 +123,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: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (194232 => 194233)


--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2015-12-17 22:13:51 UTC (rev 194233)
@@ -1,5 +1,15 @@
 2015-12-17  Babak Shafiei  <[email protected]>
 
+        Merge r191343.
+
+    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-12-17  Babak Shafiei  <[email protected]>
+
         Merge r191305.
 
     2015-10-19  Tim Horton  <[email protected]>

Modified: branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (194232 => 194233)


--- branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:51 UTC (rev 194233)
@@ -123,8 +123,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: branches/safari-601-branch/Source/WebKit2/ChangeLog (194232 => 194233)


--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-17 22:13:51 UTC (rev 194233)
@@ -1,5 +1,15 @@
 2015-12-17  Babak Shafiei  <[email protected]>
 
+        Merge r191343.
+
+    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-12-17  Babak Shafiei  <[email protected]>
+
         Merge r191305.
 
     2015-10-19  Tim Horton  <[email protected]>

Modified: branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (194232 => 194233)


--- branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:45 UTC (rev 194232)
+++ branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-12-17 22:13:51 UTC (rev 194233)
@@ -123,8 +123,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