From 33bd6e78b413bceac661225fe185b187311e2a62 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Wed, 14 Jul 2010 04:41:09 +0200 Subject: [PATCH] WebKit: Back to old version - new version didn't build --- recipes/webkit/webkit-efl_git.bb | 8 +- recipes/webkit/webkit-gtk/GNUmakefile.am | 119 ++--------------------- recipes/webkit/webkit-gtk/Makefile | 2 +- recipes/webkit/webkit-gtk/configure.ac | 33 ++----- recipes/webkit/webkit-gtk_svn.bb | 4 +- 5 files changed, 23 insertions(+), 143 deletions(-) diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb index f750061ca2..8f433962c6 100644 --- a/recipes/webkit/webkit-efl_git.bb +++ b/recipes/webkit/webkit-efl_git.bb @@ -5,12 +5,12 @@ DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \ sqlite3 libxslt gperf-native libxt" SRCREV = "3a5ee77664c898ed51a2b2d5759822f8c0a06472" -PV = "1.1.11+gitr${SRCPV}" -PR = "r8" +PV = "1.1.11+gitr${SRCREV}" +PR = "r5" SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master \ - file://fix-build-with-newer-evas.patch \ - file://fix-build-with-newer-ecore.patch" + file://fix-build-with-newer-evas.patch;patch=1 \ + file://fix-build-with-newer-ecore.patch;patch=1" S = "${WORKDIR}/git" diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index a662290fd5..399f7a4125 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -35,15 +35,11 @@ DISTCHECK_CONFIGURE_FLAGS = \ # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources -GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit GENPROGRAMS := $(top_builddir)/Programs # Script for creating hash tables CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table -# Script for creating regexp tables -CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables - # Programs to run the WebKitGtk unit tests GTESTER = gtester GTESTER_REPORT = gtester-report @@ -72,14 +68,6 @@ webcore_built_nosources := webcore_dist := webcoregtk_cppflags := webcoregtk_sources := -IDL_BINDINGS_GDOM := -GDOM_AUTO_CLASSES := -GDOM_FIXED_CLASSES := -GDOM_CLASSES := -GDOM_HEADERS_BUILT := -GDOM_HEADERS_FIXED := -libgdom_h_api := -libgdom_cleanfiles := webkitgtk_h_api := webkitgtk_sources := webkitgtk_cppflags := @@ -101,11 +89,6 @@ CLEANFILES := DISTCLEANFILES := MAINTAINERCLEANFILES := -webcoregtk_cppflags += \ - -I$(top_builddir)/DerivedSources/webkit \ - -I$(srcdir)/WebCore/bindings \ - -I$(srcdir)/WebCore/bindings/gobject - # CFLAGS/CXXFLAGS used by WebCore and WebKit # # gtk+.pc already include glib, cairo, freetype and pango CFLAGS @@ -255,7 +238,6 @@ libwebkit_1_0_la_LIBADD = \ -lpthread \ libJavaScriptCore.la \ libWebCoreJS.la \ - libgdom.la \ $(webcore_ldflags) \ $(CAIRO_LIBS) \ $(COVERAGE_LDFLAGS) \ @@ -277,15 +259,6 @@ libwebkit_1_0_la_LIBADD = \ $(UNICODE_LIBS) \ $(XT_LIBS) -libgdom_ladir = $(prefix)/include/webkit-1.0/webkit -nodist_libgdom_la_HEADERS = \ - $(libgdom_h_api) - -libgdom_cleanfiles += \ - $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \ - $(top_builddir)/libgdom.la \ - $(top_builddir)/stamp-webkitdomenumtypes.h - # # Extra checks and flags global_cppflags += \ @@ -358,7 +331,6 @@ webkitgtk_h_api += \ webkitgtk_built_sources += \ DerivedSources/webkitenumtypes.cpp \ - DerivedSources/webkitdomenumtypes.cpp \ DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitmarshal.h \ WebKit/gtk/webkit/webkitenumtypes.h @@ -413,9 +385,7 @@ webkitgtk_cppflags += \ -I$(srcdir)/WebKit/gtk \ -I$(srcdir)/WebKit/gtk/WebCoreSupport \ -I$(srcdir)/WebKit/gtk/webkit \ - -I$(top_builddir)/WebKit/gtk \ - -I$(top_builddir)/WebKit/gtk/webkit \ - -I$(GENSOURCESWEBKITDOM) + -I$(top_builddir)/WebKit/gtk/webkit webkitgtk_cleanfiles += \ $(top_builddir)/stamp-webkitmarshal.cpp \ @@ -456,16 +426,14 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la --add-include-path $(top_srcdir)/WebKit/gtk \ -I$(top_srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ - -I$(top_builddir)/DerivedSources \ -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(top_srcdir) \ - $(webkitgtk_h_api) \ - $(libgdom_h_api) + $(webkitgtk_h_api) -girdir = $(datadir)/gir-1.0 +girdir = $(GIRDIR) gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) -typelibsdir += $(libdir)/girepository-1.0 +typelibsdir += $(GIRTYPELIBDIR) typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(G_IR_COMPILER) @@ -539,49 +507,6 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile && cp xgen-gtc $@ \ && rm -f xgen-gtc -WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h - @true -stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile - $(AM_V_GEN)glib-mkenums \ - --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \ - --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \ - --fhead "#include \n\n" \ - --fhead "G_BEGIN_DECLS\n\n" \ - --ftail "G_END_DECLS\n\n" \ - --ftail "#endif\n" \ - --fprod "#include \n\n" \ - --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ - --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \ - $(libgdom_h_api) | \ - sed 's,web_kit,webkit_dom,' | \ - sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \ - > xgen-cgth \ - && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \ - && rm -f xgen-cgth \ - && echo timestamp > $(@F) - -DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile - $(AM_V_GEN)glib-mkenums \ - --fhead "#include \n" \ - --fhead "#include \n" \ - --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \ - --fhead "extern \"C\" {\n\n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "static const G@Type@Value _@enum_name@_values] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType @enum_name@_get_type(void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ - --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - --ftail "}\n" \ - $(libgdom_h_api) | \ - sed 's,web_kit,webkitdom,' \ - > xgen-cgtc \ - && cp xgen-cgtc $@ \ - && rm -f xgen-cgtc - # Files that will be distributed EXTRA_DIST += \ $(srcdir)/gtk-doc.make \ @@ -623,9 +548,6 @@ webkit_tests_cflags = \ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ - -I$(top_builddir)/DerivedSources \ - -I$(top_srcdir)/WebCore/bindings \ - -I$(top_srcdir)/WebCore/bindings/gobject \ $(global_cflags) \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ @@ -641,12 +563,8 @@ webkit_tests_ldflags = \ -no-install \ -no-fast-install -TEST_PROGS += \ - Programs/unittests/testdomdocument \ - Programs/unittests/testdomdomwindow \ - Programs/unittests/testhttpbackend \ +TEST_PROGS += Programs/unittests/testhttpbackend \ Programs/unittests/testloading \ - Programs/unittests/testglobals \ Programs/unittests/testmimehandling \ Programs/unittests/testnetworkrequest \ Programs/unittests/testnetworkresponse \ @@ -656,7 +574,6 @@ TEST_PROGS += \ Programs/unittests/testwindow \ Programs/unittests/testdownload \ Programs/unittests/testatk \ - Programs/unittests/testatkroles \ Programs/unittests/testhittestresult \ Programs/unittests/testwebsettings \ Programs/unittests/testwebresource \ @@ -665,26 +582,11 @@ TEST_PROGS += \ Programs/unittests/testkeyevents # Add additional tests here -Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c -Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c -Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags) - Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd) Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags) -Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c -Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags) - Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd) @@ -735,11 +637,6 @@ Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd) Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags) -Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c -Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags) - Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd) @@ -774,15 +671,13 @@ BUILT_SOURCES += \ $(webcore_built_sources) \ $(webcore_built_nosources) \ $(webkitgtk_built_sources) \ - $(webkitgtk_built_nosources) \ - $(gdom_built_nosources) + $(webkitgtk_built_nosources) # Project-wide clean rules # Files that will be cleaned CLEANFILES += \ $(BUILT_SOURCES) \ - $(webkitgtk_cleanfiles) \ - $(libgdom_cleanfiles) + $(webkitgtk_cleanfiles) DISTCLEANFILES += \ $(CLEANFILES) \ diff --git a/recipes/webkit/webkit-gtk/Makefile b/recipes/webkit/webkit-gtk/Makefile index 1e50d1d358..24a6f0d945 100644 --- a/recipes/webkit/webkit-gtk/Makefile +++ b/recipes/webkit/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools all: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index be29495cff..5bc1781698 100644 --- a/recipes/webkit/webkit-gtk/configure.ac +++ b/recipes/webkit/webkit-gtk/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) -m4_define([webkit_minor_version], [3]) -m4_define([webkit_micro_version], [1]) +m4_define([webkit_minor_version], [1]) +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=20:0:18 +LIBWEBKITGTK_VERSION=19:1:17 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -389,7 +389,7 @@ AC_MSG_RESULT([$enable_ruby]) # check whether to enable HTML5 sandbox iframe support AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support]) -AC_ARG_ENABLE(sandbox, +AC_ARG_ENABLE(ruby, AC_HELP_STRING([--enable-sandbox], [enable HTML5 sandboxed iframe support [default=yes]]), [],[enable_sandbox="yes"]) @@ -569,22 +569,6 @@ AC_ARG_ENABLE(fast_mobile_scrolling, [],[enable_fast_mobile_scrolling="no"]) AC_MSG_RESULT([$enable_fast_mobile_scrolling]) -# check whether to enable FileReader support -AC_MSG_CHECKING([whether to enable FileReader support]) -AC_ARG_ENABLE(file_reader, - AC_HELP_STRING([--enable-file-reader], - [enable support for FileReader [default=no]]), - [],[enable_file_reader="no"]) -AC_MSG_RESULT([$enable_file_reader]) - -# check whether to enable FileWriter support -AC_MSG_CHECKING([whether to enable FileWriter support]) -AC_ARG_ENABLE(file_writer, - AC_HELP_STRING([--enable-file-writer], - [enable support for FileWriter [default=no]]), - [],[enable_file_writer="no"]) -AC_MSG_RESULT([$enable_file_writer]) - # check whether to enable code coverage AC_MSG_CHECKING([whether to enable code coverage support]) AC_ARG_ENABLE(coverage, @@ -652,12 +636,17 @@ 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 --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 AC_SUBST([G_IR_SCANNER]) AC_SUBST([G_IR_COMPILER]) AC_SUBST([G_IR_GENERATE]) +AC_SUBST([GIRDIR]) +AC_SUBST([GIRTYPELIBDIR]) # determine the font backend AC_MSG_CHECKING([the font backend to use]) @@ -818,8 +807,6 @@ AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"]) AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) -AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"]) -AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "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"]) @@ -873,8 +860,6 @@ Features: Fast Mobile Scrolling : $enable_fast_mobile_scrolling JIT compilation : $enable_jit Filters support : $enable_filters - FileReader support : $enable_file_reader - FileWriter support : $enable_file_writer Geolocation support : $enable_geolocation JavaScript debugger/profiler support : $enable_javascript_debugger MathML support : $enable_mathml diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index b6460498ca..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 = "60413" -PV = "1.3.1+svnr${SRCPV}" +SRCREV = "56686" +PV = "1.1.90+svnr${SRCPV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ -- 2.39.5