[oe-commits] Koen Kooi : webkit-git: bump SRCREV

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b760ad5d6c04c3a49385f41edb45d8dcd5d3a6b9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b760ad5d6c04c3a49385f41edb45d8dcd5d3a6b9

Author: Koen Kooi <koen at openembedded.org>
Date:   Sun Jun  7 19:43:40 2009 +0200

webkit-git: bump SRCREV

---

 conf/distro/include/sane-srcrevs.inc   |    2 +-
 recipes/webkit/webkit-gtk/configure.ac |   25 +++++++++++++++++++++----
 recipes/webkit/webkit-gtk_svn.bb       |    1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 08d3386..7a42290 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -254,7 +254,7 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "44458"
+SRCREV_pn-webkit-gtk ?= "44489"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index 2ee8210..6375788 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -548,10 +548,23 @@ else
    CFLAGS="$CFLAGS -O0"
 fi
 
-PKG_CHECK_MODULES([LIBSOUP],
-                  [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
-AC_SUBST([LIBSOUP_CFLAGS])
-AC_SUBST([LIBSOUP_LIBS])
+# check whether to use libsoup-gnome
+AC_MSG_CHECKING([whether to use GNOME-specific features of libsoup])
+AC_ARG_WITH(libsoup_gnome,
+            AC_HELP_STRING([--with-libsoup-gnome],
+                           [using GNOME-specific features of libsoup [default=no]]),
+            [],[with_libsoup_gnome="no"])
+AC_MSG_RESULT([$with_libsoup_gnome])
+
+if test "$with_libsoup_gnome" = "yes"; then
+    PKG_CHECK_MODULES([LIBSOUP],
+                      [libsoup-gnome-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+else
+    PKG_CHECK_MODULES([LIBSOUP],
+                      [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+fi
+AC_SUBST(LIBSOUP_CFLAGS)
+AC_SUBST(LIBSOUP_LIBS)
 
 if test "$enable_gnomekeyring" = "yes"; then
    PKG_CHECK_MODULES([GNOMEKEYRING],
@@ -650,6 +663,9 @@ AM_CONDITIONAL([USE_GNOMEKEYRING], [test "$enable_gnomekeyring" = "yes"])
 AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
 AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 
+# libsoup-gnome conditionals
+AM_CONDITIONAL([USE_SOUP_GNOME], [test "$with_libsoup_gnome" = "yes"])
+
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
 AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"])
@@ -699,6 +715,7 @@ Build configuration:
  Unicode backend                                          : $with_unicode_backend
  Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
+ Using GNOME-specific features of libsoup                 : $with_libsoup_gnome
 Features:
  3D Transforms                                            : $enable_3D_transforms
  JIT compilation                                          : $enable_jit
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index db08386..f36671c 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -35,6 +35,7 @@ EXTRA_OECONF = "\
                 --enable-icon-database=yes \
                 --with-http-backend=soup \
 #                --with-unicode-backend=glib \
+                --with-libsoup-gnome=yes \
 "
 
 EXTRA_AUTORECONF = " -I autotools "