[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

robert at webkit.org robert at webkit.org
Thu Apr 8 02:05:15 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit d4ec8ce9893d8925079079c4cd0208ef402b0f7a
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 21:04:30 2010 +0000

    2010-03-01  Robert Hogan  <robert at webkit.org>
    
            Reviewed by nobody, build fix.
    
            Fix --minimal build. Add ENABLE(DATABASE) as compile time condition
            for building file GeolocationPositionCache.cpp.
    
            * page/GeolocationPositionCache.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 330081a..0544516 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-01  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by nobody, build fix.
+
+        Fix --minimal build. Add ENABLE(DATABASE) as compile time condition
+        for building file GeolocationPositionCache.cpp.
+
+        * page/GeolocationPositionCache.cpp:
+
 2010-03-01  Jakob Petsovits  <jpetsovits at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/page/GeolocationPositionCache.cpp b/WebCore/page/GeolocationPositionCache.cpp
index 5796191..f891f94 100644
--- a/WebCore/page/GeolocationPositionCache.cpp
+++ b/WebCore/page/GeolocationPositionCache.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "GeolocationPositionCache.h"
 
+#if ENABLE(DATABASE)
+
 #include "Geoposition.h"
 #include "SQLValue.h"
 #include "SQLiteDatabase.h"
@@ -173,3 +175,5 @@ void GeolocationPositionCache::writeToDB(const Geoposition* position)
 }
 
 } // namespace WebCore
+
+#endif //ENABLE(DATABASE)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list