Title: [186787] tags/Safari-601.1.39.2/Source
- Revision
- 186787
- Author
- bshaf...@apple.com
- Date
- 2015-07-13 15:24:28 -0700 (Mon, 13 Jul 2015)
Log Message
Merged r186777. rdar://problem/21789252
Modified Paths
Diff
Modified: tags/Safari-601.1.39.2/Source/_javascript_Core/ChangeLog (186786 => 186787)
--- tags/Safari-601.1.39.2/Source/_javascript_Core/ChangeLog 2015-07-13 22:24:10 UTC (rev 186786)
+++ tags/Safari-601.1.39.2/Source/_javascript_Core/ChangeLog 2015-07-13 22:24:28 UTC (rev 186787)
@@ -1,3 +1,20 @@
+2015-07-13 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186777.
+
+ 2015-07-13 Anders Carlsson <ander...@apple.com>
+
+ Apps linked with a deployment target of iOS 7.x or earlier crash when using modern WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=146913
+ rdar://problem/21789252
+
+ Reviewed by Dan Bernstein.
+
+ Make a top-level symlink from /System/Library/PrivateFrameworks/_javascript_Core.framework to
+ /System/Library/Frameworks/_javascript_Core.framework.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2015-07-10 Matthew Hanson <matthew_han...@apple.com>
Disable non-shipping features.
Modified: tags/Safari-601.1.39.2/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (186786 => 186787)
--- tags/Safari-601.1.39.2/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-07-13 22:24:10 UTC (rev 186786)
+++ tags/Safari-601.1.39.2/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-07-13 22:24:28 UTC (rev 186787)
@@ -6654,6 +6654,7 @@
5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */,
3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */,
A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */,
+ 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */,
);
buildRules = (
);
@@ -6768,6 +6769,20 @@
shellPath = /bin/sh;
shellScript = "set -e\n\nif [[ $ENABLE_FTL_JIT != \"ENABLE_FTL_JIT\" ]]\nthen\n exit 0\nfi\n\nif [[ ${CONFIGURATION:=Debug} != \"Production\" ]]\nthen\n # Copy the llvmForJSC library into the framework.\n ditto \"${BUILT_PRODUCTS_DIR}/libllvmForJSC.dylib\" \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libllvmForJSC.dylib\"\nfi\n\nif [[ $PLATFORM_NAME != \"macosx\" ]]\nthen\n exit 0\nfi\n\nif [ ! -e \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\" ]\nthen\n ln -fs \"Versions/Current/Libraries\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\"\nfi";
};
+ 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/_javascript_Core.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/_javascript_Core.framework\"";
+ };
3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: tags/Safari-601.1.39.2/Source/WebKit2/ChangeLog (186786 => 186787)
--- tags/Safari-601.1.39.2/Source/WebKit2/ChangeLog 2015-07-13 22:24:10 UTC (rev 186786)
+++ tags/Safari-601.1.39.2/Source/WebKit2/ChangeLog 2015-07-13 22:24:28 UTC (rev 186787)
@@ -1,3 +1,20 @@
+2015-07-13 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186777.
+
+ 2015-07-13 Anders Carlsson <ander...@apple.com>
+
+ Apps linked with a deployment target of iOS 7.x or earlier crash when using modern WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=146913
+ rdar://problem/21789252
+
+ Reviewed by Dan Bernstein.
+
+ Make a top-level symlink from /System/Library/PrivateFrameworks/WebKit.framework to
+ /System/Library/Frameworks/WebKit.framework.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-07-12 Babak Shafiei <bshaf...@apple.com>
Merge r186719.
Modified: tags/Safari-601.1.39.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (186786 => 186787)
--- tags/Safari-601.1.39.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-13 22:24:10 UTC (rev 186786)
+++ tags/Safari-601.1.39.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-13 22:24:28 UTC (rev 186787)
@@ -8544,6 +8544,7 @@
5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
+ 1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */,
);
buildRules = (
);
@@ -8937,6 +8938,20 @@
shellPath = /bin/sh;
shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n exec ${SRCROOT}/mac/postprocess-framework-headers.sh\nfi";
};
+ 1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/WebKit.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\"";
+ };
1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
