summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-03-19 13:38:44 +0100
committerKoen Kooi <koen@openembedded.org>2009-03-19 13:38:44 +0100
commit432c38351a0e98f897b0c029598de75895961f87 (patch)
treeb097078281787a8ba02021ab7cd51649f29473c4
parent34533ec86411fcaf5508b40cd38a9562378709a8 (diff)
webkit-gtk: bump SRCREV
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/webkit/webkit-gtk/GNUmakefile.am58
-rw-r--r--recipes/webkit/webkit-gtk/Makefile16
-rw-r--r--recipes/webkit/webkit-gtk/Makefile.shared12
-rw-r--r--recipes/webkit/webkit-gtk/configure.ac103
5 files changed, 87 insertions, 104 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7e3ba96c2a..87e9204e45 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -232,7 +232,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-webkit-gtk ?= "40814"
+SRCREV_pn-webkit-gtk ?= "41827"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-wmiconfig ?= "4522"
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index c74e1fa428..9e97e67387 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -174,7 +174,6 @@ libWebCore_la_CFLAGS = \
$(PANGO_CFLAGS) \
$(GTK_CFLAGS) \
$(XT_CFLAGS) \
- $(LIBCURL_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(SQLITE3_CFLAGS) \
@@ -201,7 +200,6 @@ libWebCore_la_LIBADD = \
$(PANGO_LIBS) \
$(GTK_LIBS) \
$(XT_LIBS) \
- $(LIBCURL_LIBS) \
$(LIBSOUP_LIBS) \
$(FREETYPE_LIBS) \
$(UNICODE_LIBS) \
@@ -237,7 +235,8 @@ libwebkit_1_0_la_CXXFLAGS = \
$(libWebCore_la_CXXFLAGS)
libwebkit_1_0_la_CFLAGS = \
- $(libWebCore_la_CFLAGS)
+ $(libWebCore_la_CFLAGS) \
+ $(GNOMEKEYRING_CFLAGS)
libwebkit_1_0_la_CPPFLAGS = \
$(libWebCore_la_CPPFLAGS) \
@@ -250,7 +249,8 @@ libwebkit_1_0_la_LDFLAGS = \
$(no_undefined)
libwebkit_1_0_la_LIBADD = \
- libWebCore.la
+ libWebCore.la \
+ $(GNOMEKEYRING_LIBS)
#
# Extra checks and flags
@@ -304,7 +304,9 @@ endif
webkitgtk_h_api += \
WebKit/gtk/webkit/webkit.h \
WebKit/gtk/webkit/webkitdefines.h \
+ WebKit/gtk/webkit/webkitdownload.h \
WebKit/gtk/webkit/webkitnetworkrequest.h \
+ WebKit/gtk/webkit/webkitsoupauthdialog.h \
WebKit/gtk/webkit/webkitversion.h \
WebKit/gtk/webkit/webkitwebbackforwardlist.h \
WebKit/gtk/webkit/webkitwebframe.h \
@@ -340,6 +342,7 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitnetworkrequest.cpp \
WebKit/gtk/webkit/webkitprivate.cpp \
WebKit/gtk/webkit/webkitprivate.h \
+ WebKit/gtk/webkit/webkitsoupauthdialog.c \
WebKit/gtk/webkit/webkitversion.cpp \
WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
WebKit/gtk/webkit/webkitwebframe.cpp \
@@ -348,6 +351,7 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
+ WebKit/gtk/webkit/webkitdownload.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
@@ -373,18 +377,7 @@ stamp_files := \
stamp-webkitenumtypes.h
WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
-WEBKIT_MARSHAL_LIST = $(WEBKIT_MARSHAL).list
-
-$(WEBKIT_MARSHAL_LIST): $(webkitgtk_sources) GNUmakefile.am
- ( cd $(top_srcdir) && \
- sed -n -e 's/.*webkit_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
- $(webkitgtk_sources) ) \
- | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
- rm $@.tmp; \
- else \
- mv $@.tmp $@; \
- fi
+WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
@true
@@ -455,10 +448,13 @@ EXTRA_DIST = \
WebKit/LICENSE \
$(javascriptcore_dist) \
$(webcore_dist) \
- symbols.filter
+ $(srcdir)/autotools/symbols.filter \
+ $(srcdir)/WebKit/gtk/ChangeLog \
+ $(srcdir)/WebKit/gtk/NEWS \
+ $(srcdir)/WebKit/gtk/webkitmarshal.list
# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
@@ -483,11 +479,13 @@ Programs_UnitTests_CFLAGS = \
-O2 \
$(global_cflags) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS)
Programs_UnitTests_LDADD = \
libwebkit-1.0.la \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(GLIB_LIBS)
# Autogenerated sources
BUILT_SOURCES := \
@@ -504,11 +502,16 @@ CLEANFILES += \
MAINTAINERCLEANFILES += \
$(srcdir)/aconfig.h.in \
- configure \
- config.* \
- GNUmakefile.in \
- INSTALL \
- README
+ $(srcdir)/autotools/config.* \
+ $(srcdir)/autotools/compile \
+ $(srcdir)/autotools/depcomp \
+ $(srcdir)/autotools/install-sh \
+ $(srcdir)/autotools/missing \
+ $(srcdir)/configure \
+ $(srcdir)/GNUmakefile.in \
+ $(srcdir)/INSTALL \
+ $(srcdir)/README \
+ $(top_builddir)/config.*
# Older automake versions (1.7) place Plo files in a different place so we need
# to create the output directory manually.
@@ -517,4 +520,9 @@ all-local:
# remove built sources and program directories
clean-local:
+ -rm -rf $(GENPROGRAMS)
+
+maintainer-clean-local: distclean-local
+
+distclean-local:
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
diff --git a/recipes/webkit/webkit-gtk/Makefile b/recipes/webkit/webkit-gtk/Makefile
index 217a035483..24a6f0d945 100644
--- a/recipes/webkit/webkit-gtk/Makefile
+++ b/recipes/webkit/webkit-gtk/Makefile
@@ -12,22 +12,6 @@ release r deployment dep deploy:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-universal u:
- @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
- if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-x86_64:
- @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
- if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64:
- @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
- if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64u:
- @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
- if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
clean:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/recipes/webkit/webkit-gtk/Makefile.shared b/recipes/webkit/webkit-gtk/Makefile.shared
index dfad6fb54c..aa9fa728d6 100644
--- a/recipes/webkit/webkit-gtk/Makefile.shared
+++ b/recipes/webkit/webkit-gtk/Makefile.shared
@@ -12,18 +12,6 @@ release r deployment dep deploy: force
$(SCRIPTS_PATH)/set-webkit-configuration --release
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-universal u: force
- ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-x86_64: force
- ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64: force
- ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64u: force
- ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
clean:
( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index c7ed988329..2535c3181f 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], [0])
+m4_define([webkit_micro_version], [3])
AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
@@ -23,13 +23,10 @@ AC_SUBST(WEBKIT_MICRO_VERSION)
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#Versioning
-LIBWEBKITGTK_VERSION=1:0:0
+dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
+LIBWEBKITGTK_VERSION=3:0:1
AC_SUBST([LIBWEBKITGTK_VERSION])
-# Recent libtool+automake don't assume you want C++, explicitly enable it
-AC_PROG_CXX
-
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
# host checking - inspired by the GTK+ configure.in
@@ -178,20 +175,6 @@ if test "$with_hildon" = "yes"; then
AC_SUBST([HILDON_LIBS])
fi
-# determine the http backend
-AC_MSG_CHECKING([the HTTP backend to use])
-AC_ARG_WITH(http_backend,
- AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@],
- [Select HTTP backend [default=curl]]),
- [],[with_http_backend="curl"])
-
-case "$with_http_backend" in
- curl|soup) ;;
- *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;;
-esac
-
-AC_MSG_RESULT([$with_http_backend])
-
# minimum base dependencies
CAIRO_REQUIRED_VERSION=1.2
FONTCONFIG_REQUIRED_VERSION=2.4
@@ -203,8 +186,7 @@ PANGO_REQUIRED_VERSION=1.0
GTK_REQUIRED_VERSION=2.8
# optional modules
-LIBCURL_REQUIRED_VERSION=7.15
-LIBSOUP_REQUIRED_VERSION=2.23
+LIBSOUP_REQUIRED_VERSION=2.25.91
LIBXSLT_REQUIRED_VERSION=1.1.7
SQLITE_REQUIRED_VERSION=3.0
GSTREAMER_REQUIRED_VERSION=0.10
@@ -221,7 +203,9 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
-PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
+PKG_CHECK_MODULES(PANGO,
+ [pango >= $PANGO_REQUIRED_VERSION
+ pangoft2])
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
@@ -286,6 +270,22 @@ AC_ARG_ENABLE(dashboard_support,
[],[enable_dashboard_support="yes"])
AC_MSG_RESULT([$enable_dashboard_support])
+# check whether to enable 3D transforms support
+AC_MSG_CHECKING([whether to enable support for 3D Transforms])
+AC_ARG_ENABLE(3D_transforms,
+ AC_HELP_STRING([--enable-3D-transforms],
+ [enable support for 3D transforms [default=no]]),
+ [],[enable_3D_transforms="no"])
+AC_MSG_RESULT([$enable_3D_transforms])
+
+# check whether to enable channel messaging support
+AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
+AC_ARG_ENABLE(channel_messaging,
+ AC_HELP_STRING([--enable-channel-messaging],
+ [enable HTML5 channel messaging support [default=no]]),
+ [],[enable_channel_messaging="no"])
+AC_MSG_RESULT([$enable_channel_messaging])
+
# check whether to enable HTML5 Offline Web Applications support
AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
AC_ARG_ENABLE(offline_web_applications,
@@ -322,8 +322,8 @@ AC_MSG_RESULT([$enable_icon_database])
AC_MSG_CHECKING([whether to enable HTML5 video support])
AC_ARG_ENABLE(video,
AC_HELP_STRING([--enable-video],
- [enable HTML5 video support [default=no]]),
- [],[enable_video="no"])
+ [enable HTML5 video support [default=yes]]),
+ [],[enable_video="yes"])
AC_MSG_RESULT([$enable_video])
# check whether to enable XPath support
@@ -350,6 +350,14 @@ AC_ARG_ENABLE(geolocation,
[],[enable_geolocation="no"])
AC_MSG_RESULT([$enable_geolocation])
+# check whether to enable gnomekeyring support
+AC_MSG_CHECKING([whether to enable gnomekeyring support])
+AC_ARG_ENABLE(gnomekeyring,
+ AC_HELP_STRING([--enable-gnomekeyring],
+ [enable support for gnomekeyring [default=no]]),
+ [],[enable_gnomekeyring="no"])
+AC_MSG_RESULT([$enable_gnomekeyring])
+
# check whether to enable SVG support
AC_MSG_CHECKING([whether to enable SVG support])
AC_ARG_ENABLE(svg,
@@ -369,7 +377,7 @@ AC_MSG_RESULT([$enable_wml])
# check whether to enable Web Workers support
AC_MSG_CHECKING([whether to enable Web Workers support])
AC_ARG_ENABLE(web_workers,
- AC_HELP_STRING([--enable-workers],
+ AC_HELP_STRING([--enable-web-workers],
[enable support for Web Workers [default=yes]]),
[],[enable_web_workers="yes"])
AC_MSG_RESULT([$enable_web_workers])
@@ -514,22 +522,16 @@ else
CFLAGS="$CFLAGS -O0"
fi
-# check if curl is available
-if test "$with_http_backend" = "curl"; then
- PKG_CHECK_MODULES([LIBCURL],
- [libcurl >= $LIBCURL_REQUIRED_VERSION])
- if test "$os_win32" = "yes"; then
- LIBCURL_LIBS="$LIBCURL_LIBS -lws2_32"
- fi
- AC_SUBST([LIBCURL_CFLAGS])
- AC_SUBST([LIBCURL_LIBS])
-fi
+PKG_CHECK_MODULES([LIBSOUP],
+ [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+AC_SUBST([LIBSOUP_CFLAGS])
+AC_SUBST([LIBSOUP_LIBS])
-if test "$with_http_backend" = "soup"; then
- PKG_CHECK_MODULES([LIBSOUP],
- [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
- AC_SUBST([LIBSOUP_CFLAGS])
- AC_SUBST([LIBSOUP_LIBS])
+if test "$enable_gnomekeyring" = "yes"; then
+ PKG_CHECK_MODULES([GNOMEKEYRING],
+ [gnome-keyring-1])
+ AC_SUBST([GNOMEKEYRING_CFLAGS])
+ AC_SUBST([GNOMEKEYRING_LIBS])
fi
# check if FreeType/FontConfig are available
@@ -541,7 +543,6 @@ if test "$with_font_backend" = "freetype"; then
else
PKG_CHECK_MODULES([FREETYPE],
[cairo-ft
- pangoft2
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION])
fi
@@ -573,7 +574,6 @@ if test "$enable_geolocation" = "yes"; then
AC_SUBST([GEOCLUE_LIBS])
fi
-
# check if gstreamer is available
if test "$enable_video" = "yes"; then
PKG_CHECK_MODULES([GSTREAMER],
@@ -610,9 +610,8 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
-# HTTP backend conditionals
-AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"])
-AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"])
+# Auth backend conditionals
+AM_CONDITIONAL([USE_GNOMEKEYRING], [test "$enable_gnomekeyring" = "yes"])
# Font backend conditionals
AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
@@ -621,6 +620,8 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"])
+AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
+AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
@@ -660,13 +661,16 @@ Build configuration:
Enable GCC build optimization : $enable_optimizations
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:
+ 3D Transforms : $enable_3D_transforms
JIT compilation : $enable_jit
Dashboard support : $enable_dashboard_support
+ Geolocation support : $enable_geolocation
+ GNOME Keyring support : $enable_gnomekeyring
HTML5 offline web applications support : $enable_offline_web_applications
+ HTML5 channel messaging support : $enable_channel_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
@@ -678,11 +682,10 @@ Features:
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
WML support : $enable_wml
Web Workers support : $enable_web_workers
- Geolocation support : $enable_geolocation
+ XPATH support : $enable_xpath
+ XSLT support : $enable_xslt
GTK+ configuration:
GDK target : $with_target
Hildon UI extensions : $with_hildon