summaryrefslogtreecommitdiff
path: root/recipes/webkit
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-03-28 15:03:33 +0200
committerKoen Kooi <koen@openembedded.org>2010-03-28 15:30:21 +0200
commitaff4366332b4c2eb4eee1a3ec4724213dafa61d6 (patch)
tree6eb8843e07a9579567736fc98365cae60ed37c19 /recipes/webkit
parentcb8da763d1e62c5cac570ad61340ef664d32a331 (diff)
webkit: bump SRCREV
Diffstat (limited to 'recipes/webkit')
-rw-r--r--recipes/webkit/webkit-gtk/GNUmakefile.am3
-rw-r--r--recipes/webkit/webkit-gtk/configure.ac14
-rw-r--r--recipes/webkit/webkit-gtk_svn.bb4
3 files changed, 16 insertions, 5 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index 9f0fa20e0c..399f7a4125 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -524,7 +524,8 @@ EXTRA_DIST += \
$(srcdir)/WebKit/gtk/docs/version.xml.in \
$(srcdir)/WebKit/gtk/po/* \
$(srcdir)/WebKit/gtk/resources/* \
- $(srcdir)/WebKit/gtk/tests/resources/*
+ $(srcdir)/WebKit/gtk/tests/resources/* \
+ $(srcdir)/WebKit/gtk/tests/test_utils.h
# extra resource files
resourcesdir = ${datadir}/webkit-1.0/resources
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index f0f11bfe49..5bc1781698 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [22])
+m4_define([webkit_micro_version], [90])
# This is the version we'll be using as part of our User-Agent string
# e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
dnl # Libtool library version, not to confuse with API version
dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=18:0:16
+LIBWEBKITGTK_VERSION=19:1:17
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -561,6 +561,14 @@ AC_ARG_ENABLE(blob_slice,
[],[enable_blob_slice="no"])
AC_MSG_RESULT([$enable_blob_slice])
+# check whether to enable Fast Mobile Scrolling support
+AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
+AC_ARG_ENABLE(fast_mobile_scrolling,
+ AC_HELP_STRING([--enable-fast-mobile-scrolling],
+ [enable support for Fast Mobile Scrolling [default=no]]),
+ [],[enable_fast_mobile_scrolling="no"])
+AC_MSG_RESULT([$enable_fast_mobile_scrolling])
+
# check whether to enable code coverage
AC_MSG_CHECKING([whether to enable code coverage support])
AC_ARG_ENABLE(coverage,
@@ -792,6 +800,7 @@ AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
+AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
@@ -848,6 +857,7 @@ Build configuration:
Features:
3D Transforms : $enable_3D_transforms
Blob.slice support : $enable_blob_slice
+ Fast Mobile Scrolling : $enable_fast_mobile_scrolling
JIT compilation : $enable_jit
Filters support : $enable_filters
Geolocation support : $enable_geolocation
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index 36174965d0..7356d8b386 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -4,8 +4,8 @@ DEPENDS = "geoclue enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl
SRCREV_FORMAT = "webcore-rwebkit"
PR = "r1"
-SRCREV = "55715"
-PV = "1.1.22+svnr${SRCPV}"
+SRCREV = "56686"
+PV = "1.1.90+svnr${SRCPV}"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \