[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 59ebe2195aea53f5a0ec599a7e63ff369ae1aa8d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 20 03:47:16 2003 +0000
JavaScriptCore:
- fixed 3261096 - Make WebKit an umbrella framework
* JavaScriptCore.pbproj/project.pbxproj: In a B&I build, compile as a
sub-umbrella of WebKit.
WebCore:
- fixed 3261096 - Make WebKit an umbrella framework
* WebCore.pbproj/project.pbxproj: In a B&I build, compile as a
sub-umbrella of WebKit.
WebKit:
- fixed 3261096 - Make WebKit an umbrella framework
* WebKit.pbproj/project.pbxproj: Build WebKit as a public umbrella
framework when doing a B&I build.
WebBrowser:
- fixed 3261096 - Make WebKit an umbrella framework
* WebBrowser.pbproj/project.pbxproj: Build with umbrella public
WebKit when doing a B&I build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4395 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 69d561d..4ef45c5 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-19 Maciej Stachowiak <mjs at apple.com>
+
+ - fixed 3261096 - Make WebKit an umbrella framework
+
+ * JavaScriptCore.pbproj/project.pbxproj: In a B&I build, compile as a
+ sub-umbrella of WebKit.
+
2003-05-16 Maciej Stachowiak <mjs at apple.com>
Reviewed by Ken.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 69d561d..4ef45c5 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-05-19 Maciej Stachowiak <mjs at apple.com>
+
+ - fixed 3261096 - Make WebKit an umbrella framework
+
+ * JavaScriptCore.pbproj/project.pbxproj: In a B&I build, compile as a
+ sub-umbrella of WebKit.
+
2003-05-16 Maciej Stachowiak <mjs at apple.com>
Reviewed by Ken.
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index ee740bf..6a0e348 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -11,8 +11,9 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
+ INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -23,7 +24,8 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -110,7 +112,6 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
F692A8D8025563E401FF60F7,
- 6573C62F03A0BDCD00FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -121,18 +122,17 @@
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Frameworks";
LIBRARY_SEARCH_PATHS = "";
LOCAL_SEG1_ADDR = 0x8000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- OTHER_LDFLAGS = "-seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
+ OTHER_LDFLAGS = "-seg_addr_table_filename \"${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\" -umbrella WebKit -allowable_client JSGlue";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = JavaScriptCorePrefix.h;
PRODUCT_NAME = JavaScriptCore;
SECTORDER_FLAGS = "";
- SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
@@ -141,7 +141,7 @@
);
isa = PBXFrameworkTarget;
name = JavaScriptCore;
- productInstallPath = "@executable_path/../Frameworks";
+ productInstallPath = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Frameworks";
productName = JavaScriptCore;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -169,6 +169,7 @@
</dict>
</plist>
";
+ shouldUseHeadermap = 0;
};
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -587,19 +588,6 @@
settings = {
};
};
- 6573C62F03A0BDCD00FCA39F = {
- buildActionMask = 8;
- files = (
- );
- generatedFileNames = (
- );
- isa = PBXShellScriptBuildPhase;
- neededFileNames = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [ \"x$RC_RELEASE\" = \"xPanther\" ]; then\n install_name_tool -id \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore\" \"${SYMROOT}/JavaScriptCore.framework/Versions/A/JavaScriptCore\" ;\n ditto \"${SYMROOT}/JavaScriptCore.framework\" \"${DSTROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\" ;\n strip -S ${DSTROOT}/\"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore\";\nelse\n ditto \"${SYMROOT}/JavaScriptCore.framework\" \"${DSTROOT}/AppleInternal/Library/Frameworks/JavaScriptCore.framework\"\n strip -S \"${DSTROOT}/AppleInternal/Library/Frameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore\"\nfi";
- };
//650
//651
//652
@@ -827,7 +815,8 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e2f1b41..9800319 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-05-19 Maciej Stachowiak <mjs at apple.com>
+
+ - fixed 3261096 - Make WebKit an umbrella framework
+
+ * WebCore.pbproj/project.pbxproj: In a B&I build, compile as a
+ sub-umbrella of WebKit.
+
2003-05-19 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e2f1b41..9800319 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-05-19 Maciej Stachowiak <mjs at apple.com>
+
+ - fixed 3261096 - Make WebKit an umbrella framework
+
+ * WebCore.pbproj/project.pbxproj: In a B&I build, compile as a
+ sub-umbrella of WebKit.
+
2003-05-19 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index d2f28a6..90534c0 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -12,8 +12,9 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
+ INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -24,7 +25,8 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -118,7 +120,6 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
255AF6590250FC030ECA149E,
- 6573C63B03A0BE5700FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -126,22 +127,21 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebCore.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\" \"${DSTROOT}/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"${DSTROOT}\" \"${MERGE_DIR}/$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = ForwardingHeaders;
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Frameworks;
LIBRARY_SEARCH_PATHS = "";
LOCAL_SEG1_ADDR = 0x9000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
+ OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\" -umbrella WebKit";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebCorePrefix.h;
PRODUCT_NAME = WebCore;
SECTORDER_FLAGS = "";
- SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
@@ -152,7 +152,7 @@
);
isa = PBXFrameworkTarget;
name = WebCore;
- productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ productInstallPath = /System/Library/Frameworks/WebKit.framework/Frameworks;
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -178,6 +178,7 @@
</dict>
</plist>
";
+ shouldUseHeadermap = 0;
};
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -905,19 +906,6 @@
);
};
};
- 6573C63B03A0BE5700FCA39F = {
- buildActionMask = 8;
- files = (
- );
- generatedFileNames = (
- );
- isa = PBXShellScriptBuildPhase;
- neededFileNames = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [ \"x$RC_RELEASE\" = \"xPanther\" ]; then\n install_name_tool -id \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebCore.framework/Versions/A/WebCore\" \"${SYMROOT}/WebCore.framework/Versions/A/WebCore\" ;\n ditto \"${SYMROOT}/WebCore.framework\" \"${DSTROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebCore.framework\" ;\n strip -S ${DSTROOT}/\"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebCore.framework/Versions/A/WebCore\";\nelse\n ditto \"${SYMROOT}/WebCore.framework\" \"${DSTROOT}/AppleInternal/Library/Frameworks/WebCore.framework\"\n strip -S \"${DSTROOT}/AppleInternal/Library/Frameworks/WebCore.framework/Versions/A/WebCore\"\nfi";
- };
//650
//651
//652
@@ -8086,7 +8074,8 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = WebCore.exp;
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 59273c1..0ed4eba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-19 Maciej Stachowiak <mjs at apple.com>
+
+ - fixed 3261096 - Make WebKit an umbrella framework
+
+ * WebKit.pbproj/project.pbxproj: Build WebKit as a public umbrella
+ framework when doing a B&I build.
+
2003-05-19 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 74ab684..a568479 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -11,8 +11,9 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
+ INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -23,7 +24,8 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -124,7 +126,6 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
255AF6590250FC030ECA149E,
- 6573C62203A0BD7100FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -132,22 +133,21 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebKit.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\" \"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\" \"${DSTROOT}/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"${DSTROOT}\" \"${MERGE_DIR}/${SYSTEM_LIBRARY_DIR}/Frameworks\" \"${MERGE_DIR}/$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = /System/Library/Frameworks;
LIBRARY_SEARCH_PATHS = "";
LOCAL_SEG1_ADDR = 0x7000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DFRAMEWORK_NAME=WebKit";
- OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
+ OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\" -sub_umbrella WebCore -sub_umbrella JavaScriptCore";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebKitPrefix.h;
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
- SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
@@ -156,7 +156,7 @@
);
isa = PBXFrameworkTarget;
name = WebKit;
- productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ productInstallPath = /System/Library/Frameworks;
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -182,6 +182,7 @@
</dict>
</plist>
";
+ shouldUseHeadermap = 0;
};
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -1518,19 +1519,6 @@
settings = {
};
};
- 6573C62203A0BD7100FCA39F = {
- buildActionMask = 8;
- files = (
- );
- generatedFileNames = (
- );
- isa = PBXShellScriptBuildPhase;
- neededFileNames = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [ \"x$RC_RELEASE\" = \"xPanther\" ]; then\n install_name_tool -id \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework/Versions/A/WebKit\" \"${SYMROOT}/WebKit.framework/Versions/A/WebKit\" ;\n ditto \"${SYMROOT}/WebKit.framework\" \"${DSTROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\" ;\n strip -S ${DSTROOT}/\"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework/Versions/A/WebKit\";\nelse\n ditto \"${SYMROOT}/WebKit.framework\" \"${DSTROOT}/AppleInternal/Library/Frameworks/WebKit.framework\"\n strip -S \"${DSTROOT}/AppleInternal/Library/Frameworks/WebKit.framework/Versions/A/WebKit\"\nfi";
- };
6578F5DE045F817400000128 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -2988,7 +2976,8 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
- OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 679e0ca..522ed77 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -271,7 +271,7 @@
if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
NSURL *baseURL = [request _webDataRequestBaseURL];
if (baseURL == nil) {
- baseURL = @"about:blank";
+ baseURL = [NSURL URLWithString:@"about:blank"];
}
r = [[[NSURLResponse alloc] initWithURL:baseURL MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
}
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 679e0ca..522ed77 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -271,7 +271,7 @@
if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
NSURL *baseURL = [request _webDataRequestBaseURL];
if (baseURL == nil) {
- baseURL = @"about:blank";
+ baseURL = [NSURL URLWithString:@"about:blank"];
}
r = [[[NSURLResponse alloc] initWithURL:baseURL MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list