[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3c5f74e676fa073279377391cfd8528acce071d2
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 00:20:54 2010 +0000

    Allow the web process to load frameworks other than WebKit2.framework from the build directory
    when running engineering builds.
    
    Reviewed by Sam Weinig.
    
    * WebProcess/mac/WebProcessMainMac.mm:
    (WebKit::WebProcessMain): Pass the path containing WebKit2.framework to the sandbox rather than
    the path of the WebKit2.framework itself.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5c8b62e..649032a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-01  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Allow the web process to load frameworks other than WebKit2.framework from the build directory
+        when running engineering builds.
+
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMain): Pass the path containing WebKit2.framework to the sandbox rather than
+        the path of the WebKit2.framework itself.
+
 2010-09-01  Sam Weinig  <sam at webkit.org>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/WebProcess/mac/WebProcessMainMac.mm b/WebKit2/WebProcess/mac/WebProcessMainMac.mm
index c8848d5..dece49a 100644
--- a/WebKit2/WebProcess/mac/WebProcessMainMac.mm
+++ b/WebKit2/WebProcess/mac/WebProcessMainMac.mm
@@ -59,7 +59,7 @@ int WebProcessMain(CommandLine* commandLine)
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
     char* errorBuf;
-    const char* frameworkPath = [[[NSBundle bundleForClass:[WKView class]] bundlePath] UTF8String];
+    const char* frameworkPath = [[[[NSBundle bundleForClass:[WKView class]] bundlePath] stringByDeletingLastPathComponent] UTF8String];
     const char* profilePath = [[[NSBundle mainBundle] pathForResource:@"com.apple.WebProcess" ofType:@"sb"] UTF8String];
     const char* const sandboxParam[] = { "webkit2_framework_path", frameworkPath, NULL };
 

-- 
WebKit Debian packaging