5 files changed, 37 insertions, 28 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 0dc851bfed..a88407f568 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -142,7 +142,7 @@ SRCREV_pn-gaku ?= "365"
 SRCREV_pn-gypsy ?= "39"
 SRCDATE_yaffs2-utils = "20071107"
 SRCDATE_yaffs2-utils-native = "20071107"
-SRCREV_pn-webkit-gtk ?= "31467"
+SRCREV_pn-webkit-gtk ?= "31859"
 SRCREV_pn-clipboard-manager ?= "14994"
 SRCREV_pn-opkg ?= "4209"
 SRCREV_pn-opkg-native ?= "4209"
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am
index 4cdd3dbfeb..a0aefbf50b 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/packages/webkit/files/GNUmakefile.am
@@ -116,13 +116,13 @@ libJavaScriptCore_la_CXXFLAGS = \
         $(global_cflags) \
         $(GLOBALDEPS_CFLAGS) \
         $(UNICODE_CFLAGS) \
-        -fstrict-aliasing
+        -fno-strict-aliasing
 
 libJavaScriptCore_la_CFLAGS = \
         $(global_cflags) \
         $(GLOBALDEPS_CFLAGS) \
         $(UNICODE_CFLAGS) \
-        -fstrict-aliasing
+        -fno-strict-aliasing
 
 libJavaScriptCore_la_CPPFLAGS = \
         $(global_cppflags) \
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/packages/webkit/files/autogen.sh
index a929538d20..a929538d20 100644..100755
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/packages/webkit/files/autogen.sh
diff --git a/meta/packages/webkit/files/configure.ac b/meta/packages/webkit/files/configure.ac
index 64f32dc689..3ab2baffb8 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/packages/webkit/files/configure.ac
@@ -263,11 +263,19 @@ AC_ARG_ENABLE(cross_document_messaging,
               [],[enable_cross_document_messaging="yes"])
 AC_MSG_RESULT([$enable_cross_document_messaging])
 
+# check whether to enable HTML5 client-side session and persitent storage support
+AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
+AC_ARG_ENABLE(dom_storage,
+              AC_HELP_STRING([--enable-dom-storage],
+                             [enable HTML5 client-side session and persistent storage support [default=no]]),
+              [],[enable_dom_storage="no"])
+AC_MSG_RESULT([$enable_dom_storage])
+
 # check whether to build with database support
-AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
+AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support])
 AC_ARG_ENABLE(database,
               AC_HELP_STRING([--enable-database],
-                             [enable HTML5 client-side storage support [default=yes]]),
+                             [enable HTML5 client-side database storage support [default=yes]]),
               [],[enable_database="yes"])
 AC_MSG_RESULT([$enable_database])
 
@@ -498,6 +506,7 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
 AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
+AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
 AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
 AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
@@ -526,27 +535,28 @@ echo "
 WebKit was configured with the following options:
 
 Build configuration:
- Enable debugging (slow)           : $enable_debug
- Code coverage support             : $enable_coverage
- Unicode backend                   : $unicode_backend
- HTTP backend                      : $with_http_backend
- Font backend                      : $with_font_backend
- Optimized memory allocator        : $enable_fast_malloc
+ Enable debugging (slow)                                  : $enable_debug
+ Code coverage support                                    : $enable_coverage
+ Unicode backend                                          : $unicode_backend
+ HTTP backend                                             : $with_http_backend
+ Font backend                                             : $with_font_backend
+ Optimized memory allocator                               : $enable_fast_malloc
 Features:
- HTML5 cross-document messaging    : $enable_cross_document_messaging
- HTML5 client-side storage support : $enable_database
- HTML5 video element support       : $enable_video
- Icon database support             : $enable_icon_database
- SVG support                       : $enable_svg
- SVG animation support             : $enable_svg_animation
- SVG filters support               : $enable_svg_filters
- SVG fonts support                 : $enable_svg_fonts
- SVG foreign object support        : $enable_svg_foreign_object
- SVG as image support              : $enable_svg_as_image
- SVG use element support           : $enable_svg_use_element
- XPATH support                     : $enable_xpath
- XSLT support                      : $enable_xslt
+ HTML5 cross-document messaging                           : $enable_cross_document_messaging
+ HTML5 client-side session and persistent storage support : $enable_dom_storage
+ HTML5 client-side database storage support               : $enable_database
+ HTML5 video element support                              : $enable_video
+ Icon database support                                    : $enable_icon_database
+ SVG support                                              : $enable_svg
+ SVG animation support                                    : $enable_svg_animation
+ SVG filters support                                      : $enable_svg_filters
+ SVG fonts support                                        : $enable_svg_fonts
+ SVG foreign object support                               : $enable_svg_foreign_object
+ SVG as image support                                     : $enable_svg_as_image
+ SVG use element support                                  : $enable_svg_use_element
+ XPATH support                                            : $enable_xpath
+ XSLT support                                             : $enable_xslt
 GTK+ configuration:
- GDK target                        : $with_target
- Hildon UI extensions              : $with_hildon
+ GDK target                                               : $with_target
+ Hildon UI extensions                                     : $with_hildon
 "
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index c7a49fdd2f..2e7a0885c0 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -4,7 +4,7 @@ SRCREV_FORMAT = "webcore-rwebkit"
 
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -27,7 +27,6 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
-                --enable-svg-fonts \
                 --enable-icon-database=yes \
                "