Title: [195974] tags/Safari-602.1.18.0.1/Source/WebKit2
- Revision
- 195974
- Author
- [email protected]
- Date
- 2016-02-01 12:40:42 -0800 (Mon, 01 Feb 2016)
Log Message
Merged r195964. rdar://problem/24424987
Modified Paths
Diff
Modified: tags/Safari-602.1.18.0.1/Source/WebKit2/ChangeLog (195973 => 195974)
--- tags/Safari-602.1.18.0.1/Source/WebKit2/ChangeLog 2016-02-01 20:35:10 UTC (rev 195973)
+++ tags/Safari-602.1.18.0.1/Source/WebKit2/ChangeLog 2016-02-01 20:40:42 UTC (rev 195974)
@@ -1,3 +1,16 @@
+2016-02-01 Babak Shafiei <[email protected]>
+
+ Merge r195964.
+
+ 2016-02-01 Anders Carlsson <[email protected]>
+
+ Stop linking to PassKit
+ https://bugs.webkit.org/show_bug.cgi?id=153746
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebKit.xcconfig:
+
2016-01-28 Antti Koivisto <[email protected]>
Enable background tab suspension by default on OSX
Modified: tags/Safari-602.1.18.0.1/Source/WebKit2/Configurations/WebKit.xcconfig (195973 => 195974)
--- tags/Safari-602.1.18.0.1/Source/WebKit2/Configurations/WebKit.xcconfig 2016-02-01 20:35:10 UTC (rev 195973)
+++ tags/Safari-602.1.18.0.1/Source/WebKit2/Configurations/WebKit.xcconfig 2016-02-01 20:40:42 UTC (rev 195974)
@@ -36,8 +36,8 @@
FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt $(FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_$(PLATFORM_NAME));
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphoneos*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework IOSurface;
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios);
-FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphoneos = -framework PassKit;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphonesimulator = -framework PassKit;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphoneos = ;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphonesimulator = ;
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
