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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:06:34 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a3551e3a69a7e37ada30d594265ab82145b3d4d2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 08:28:49 2010 +0000

    2010-09-07  Joerg Bornemann  <joerg.bornemann at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            Fix QtWebKit linker error on Windows CE 6.
            https://bugs.webkit.org/show_bug.cgi?id=43442
    
            Doesn't affect any tests.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 27331b7..d9b2e58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-07  Joerg Bornemann  <joerg.bornemann at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        Fix QtWebKit linker error on Windows CE 6.
+        https://bugs.webkit.org/show_bug.cgi?id=43442
+
+        Doesn't affect any tests.
+
+        * WebCore.pro:
+
 2010-09-07  James Kozianski  <koz at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 3f23cdd..775b07e 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2463,6 +2463,8 @@ contains(DEFINES, ENABLE_SQLITE=1) {
         }
     }
 
+    wince*:DEFINES += HAVE_LOCALTIME_S=0
+
     SOURCES += \
         platform/sql/SQLiteAuthorizer.cpp \
         platform/sql/SQLiteDatabase.cpp \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list