[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

kevino at webkit.org kevino at webkit.org
Thu Oct 29 20:50:40 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 3ea73337400f73e2e05009218c18c2d229358b39
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 16:45:47 2009 +0000

    wxMac 10.4 build fix, needs to link against WebKitSystemInterfaceTiger to get
    character measurement APIs that are private on Tiger.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49982 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index af0706b..2e0ee1d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-23  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMac 10.4 build fix, needs to link against WebKitSystemInterfaceTiger to get 
+        character measurement APIs that are private on Tiger.
+
+        * wx/build/settings.py:
+
 2009-10-22  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by NOBODY (build fix).
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 947f053..50ea5bf 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -280,6 +280,7 @@ def common_configure(conf):
         sdk_version = min_version
         if min_version == "10.4":
             sdk_version += "u"
+            conf.env.append_value('LIB', ['WebKitSystemInterfaceTiger'])
         
         sdkroot = '/Developer/SDKs/MacOSX%s.sdk' % sdk_version
         sdkflags = ['-arch', 'i386', '-isysroot', sdkroot]

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list