From 3e891e35d2ce223da962b088211e4a44568a0e53 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Dec 2009 17:49:10 +0100 Subject: webkit-gtk: bump to 1.1.18+svnr52207 --- recipes/webkit/webkit-gtk/GNUmakefile.am | 78 ++++++++++++++++++++++---------- recipes/webkit/webkit-gtk/configure.ac | 33 +++++++------- recipes/webkit/webkit-gtk_svn.bb | 6 +-- 3 files changed, 71 insertions(+), 46 deletions(-) (limited to 'recipes/webkit') diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index 89260ad3a9..3a0e398aa4 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -29,6 +29,10 @@ srcdir = @srcdir@ VPATH = @srcdir@ +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-introspection \ + --enable-gtk-doc + # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources GENPROGRAMS := $(top_builddir)/Programs @@ -74,6 +78,11 @@ global_cflags := global_cxxflags := corekit_cflags := corekit_cppflags := +JSCORE_GIRSOURCES := +WEBKIT_GIRSOURCES := +typelibsdir := +typelibs_DATA := +EXTRA_DIST := BUILT_SOURCES := CLEANFILES := DISTCLEANFILES := @@ -152,6 +161,7 @@ javascriptcore_cppflags += \ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(srcdir)/JavaScriptCore/parser \ -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/wtf/gtk \ -I$(top_builddir)/DerivedSources nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ @@ -413,29 +423,16 @@ webkitgtk_cleanfiles += \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc -# Files that will be distributed -EXTRA_DIST = \ - $(srcdir)/gtk-doc.make \ - WebKit/LICENSE \ - $(javascriptcore_dist) \ - $(webcore_dist) \ - $(srcdir)/autotools/symbols.filter \ - $(srcdir)/WebKit/gtk/ChangeLog \ - $(srcdir)/WebKit/gtk/NEWS \ - $(srcdir)/WebKit/gtk/webkitmarshal.list \ - $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ - $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ - $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ - $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ - $(srcdir)/WebKit/gtk/docs/version.xml.in \ - $(srcdir)/WebKit/gtk/po/* \ - $(srcdir)/WebKit/gtk/resources/* - if ENABLE_INTROSPECTION -JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten -WEBKIT_GIRSOURCES = WebKit-1.0.gir +JSCORE_GIRSOURCES += JSCore-1.0.gir +WEBKIT_GIRSOURCES += WebKit-1.0.gir + +# JSCore-1.0.gir is handwritten - this is a hack to make the typelib +# generation work during make dist +JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir + cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/ -$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) +$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \ --include=GObject-2.0 \ --include=Gtk-2.0 \ @@ -446,6 +443,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) --pkg gobject-2.0 \ --pkg gtk+-2.0 \ --output $@ \ + --add-include-path $(top_srcdir)/WebKit/gtk \ -I$(top_srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ @@ -455,14 +453,14 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) girdir = $(GIRDIR) gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) -typelibsdir = $(GIRTYPELIBDIR) -typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) +typelibsdir += $(GIRTYPELIBDIR) +typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(G_IR_COMPILER) - $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@ + $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@ EXTRA_DIST += $(JSCORE_GIRSOURCES) -CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA) +CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) endif @@ -528,6 +526,24 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile && cp xgen-gtc $@ \ && rm -f xgen-gtc +# Files that will be distributed +EXTRA_DIST += \ + $(srcdir)/gtk-doc.make \ + WebKit/LICENSE \ + $(javascriptcore_dist) \ + $(webcore_dist) \ + $(srcdir)/autotools/symbols.filter \ + $(srcdir)/WebKit/gtk/ChangeLog \ + $(srcdir)/WebKit/gtk/NEWS \ + $(srcdir)/WebKit/gtk/webkitmarshal.list \ + $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ + $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ + $(srcdir)/WebKit/gtk/docs/version.xml.in \ + $(srcdir)/WebKit/gtk/po/* \ + $(srcdir)/WebKit/gtk/resources/* + # extra resource files resourcesdir = ${datadir}/webkit-1.0/resources dist_resources_DATA = \ @@ -566,6 +582,7 @@ webkit_tests_ldflags = \ TEST_PROGS += Programs/unittests/testhttpbackend \ Programs/unittests/testloading \ + Programs/unittests/testmimehandling \ Programs/unittests/testnetworkrequest \ Programs/unittests/testnetworkresponse \ Programs/unittests/testwebframe \ @@ -578,6 +595,7 @@ TEST_PROGS += Programs/unittests/testhttpbackend \ Programs/unittests/testwebsettings \ Programs/unittests/testwebresource \ Programs/unittests/testwebdatasource \ + Programs/unittests/testwebview \ Programs/unittests/testkeyevents # Add additional tests here @@ -591,6 +609,11 @@ Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd) Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags) +Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c +Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags) + Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd) @@ -644,6 +667,11 @@ Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasourc Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c +Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags) + Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd) diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index b4230fb7fa..d2877c0834 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], [16]) +m4_define([webkit_micro_version], [18]) # 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=14:0:12 +LIBWEBKITGTK_VERSION=15:0:13 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -191,7 +191,7 @@ fi # minimum base dependencies LIBSOUP_REQUIRED_VERSION=2.27.91 -CAIRO_REQUIRED_VERSION=1.2 +CAIRO_REQUIRED_VERSION=1.6 FONTCONFIG_REQUIRED_VERSION=2.4 FREETYPE2_REQUIRED_VERSION=9.0 LIBXML_REQUIRED_VERSION=2.6 @@ -371,14 +371,6 @@ AC_ARG_ENABLE(datalist, [],[enable_datalist="yes"]) AC_MSG_RESULT([$enable_datalist]) -# check whether to enable HTML5 ruby support -AC_MSG_CHECKING([whether to enable HTML5 ruby support]) -AC_ARG_ENABLE(ruby, - AC_HELP_STRING([--enable-ruby], - [enable HTML5 ruby support [default=yes]]), - [],[enable_ruby="yes"]) -AC_MSG_RESULT([$enable_ruby]) - # check whether to enable HTML5 audio/video support AC_MSG_CHECKING([whether to enable HTML5 video support]) AC_ARG_ENABLE(video, @@ -472,8 +464,8 @@ AC_MSG_RESULT([$enable_svg_animation]) AC_MSG_CHECKING([whether to enable support for filters]) AC_ARG_ENABLE(filters, AC_HELP_STRING([--enable-filters], - [enable support for filters (experimental) [default=no]]), - [],[enable_filters="no"]) + [enable support for filters (experimental) [default=yes]]), + [],[enable_filters="yes"]) AC_MSG_RESULT([$enable_filters]) # check whether to enable support for SVG fonts @@ -596,8 +588,8 @@ if test "$enable_introspection" = "yes"; then G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" - GIRDIR="$($PKG_CONFIG --variable=girdir gobject-introspection-1.0)" - GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)" + GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)" AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support]) fi @@ -643,6 +635,15 @@ PKG_CHECK_MODULES([LIBSOUP], AC_SUBST([LIBSOUP_CFLAGS]) AC_SUBST([LIBSOUP_LIBS]) +# check if we can use libSoup 2.29.3 features +PKG_CHECK_MODULES([LIBSOUP_2_29_3], + [libsoup-2.4 >= 2.29.3], + [have_libsoup_2_29_3=yes], + [have_libsoup_2_29_3=no]) +if test "$have_libsoup_2_29_3" = "yes"; then + AC_DEFINE([HAVE_LIBSOUP_2_29_3], 1, [Whether libSoup 2.29.3 features are available]) +fi + # check if FreeType/FontConfig are available if test "$with_font_backend" = "freetype"; then if test "$with_target" = "directfb"; then @@ -756,7 +757,6 @@ AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) -AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"]) AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) @@ -812,7 +812,6 @@ Features: 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 ruby support : $enable_ruby HTML5 server-sent events support : $enable_eventsource HTML5 video element support : $enable_video Icon database support : $enable_icon_database diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index 96f47f1663..a2d3be83b1 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -3,8 +3,8 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib SRCREV_FORMAT = "webcore-rwebkit" -SRCREV = "50081" -PV = "1.1.16+svnr${SRCPV}" +SRCREV = "52207" +PV = "1.1.18+svnr${SRCPV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -32,9 +32,7 @@ EXTRA_OECONF = "\ --enable-debug=no \ --enable-svg \ --enable-icon-database=yes \ - --with-http-backend=soup \ # --with-unicode-backend=glib \ - --with-libsoup-gnome=yes \ " EXTRA_AUTORECONF = " -I autotools " -- cgit 1.2.3-korg