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

eric at webkit.org eric at webkit.org
Wed Dec 22 12:06:10 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ffaa6328bc2deaf29aff310102473c60e6949071
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 06:44:40 2010 +0000

    2010-08-13  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Build fix only.
    
            Add support for MathML entities
            https://bugs.webkit.org/show_bug.cgi?id=43949
    
            * Scripts/create-html-entity-table:
             - Hack sys.path to avoid executing 2.5 dependent python
               on systems (like chromium-win and Tiger) which do not have 2.5 python.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8ac14fa..a4d26a5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-13  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Build fix only.
+
+        Add support for MathML entities
+        https://bugs.webkit.org/show_bug.cgi?id=43949
+
+        * Scripts/create-html-entity-table:
+         - Hack sys.path to avoid executing 2.5 dependent python
+           on systems (like chromium-win and Tiger) which do not have 2.5 python.
+
 2010-08-13  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/create-html-entity-table b/WebKitTools/Scripts/create-html-entity-table
index 0e5154a..46c8c52 100755
--- a/WebKitTools/Scripts/create-html-entity-table
+++ b/WebKitTools/Scripts/create-html-entity-table
@@ -31,7 +31,13 @@ import os.path
 import string
 import sys
 
-import webkitpy.thirdparty.simplejson as simplejson
+# Hack sys.path to avoid executing webkitpy __init__.py code which may
+# use Python 2.5 features.  This code needs to run on Python 2.3 in order
+# to support Mac OS X Tiger.
+scripts_directory = sys.path[0]
+sys.path.append("%s/webkitpy/thirdparty" % scripts_directory)
+
+import simplejson
 
 
 def convert_entity_to_cpp_name(entity):

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list