summaryrefslogtreecommitdiffstats
path: root/meta/packages/webkit
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-14 09:52:55 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-14 09:52:55 +0000
commitd12aa66245d694ff26676294fd19b5d69cb10f50 (patch)
treecd156fb775994f5ebf57dd6c35aaa19a9d880b2a /meta/packages/webkit
parent0e55205d349e7b4b87df3a9c31dbc00caa9d235f (diff)
downloadpoky-d12aa66245d694ff26676294fd19b5d69cb10f50.tar.gz
webkit: updated to r31859 and disabled SVG fonts
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4246 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/webkit')
-rw-r--r--meta/packages/webkit/files/GNUmakefile.am4
-rwxr-xr-x[-rw-r--r--]meta/packages/webkit/files/autogen.sh0
-rw-r--r--meta/packages/webkit/files/configure.ac56
-rw-r--r--meta/packages/webkit/webkit-gtk_svn.bb3
4 files changed, 36 insertions, 27 deletions
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am
index 4cdd3dbfeb..a0aefbf50b 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/packages/webkit/files/GNUmakefile.am
@@ -116,13 +116,13 @@ libJavaScriptCore_la_CXXFLAGS = \
116 $(global_cflags) \ 116 $(global_cflags) \
117 $(GLOBALDEPS_CFLAGS) \ 117 $(GLOBALDEPS_CFLAGS) \
118 $(UNICODE_CFLAGS) \ 118 $(UNICODE_CFLAGS) \
119 -fstrict-aliasing 119 -fno-strict-aliasing
120 120
121libJavaScriptCore_la_CFLAGS = \ 121libJavaScriptCore_la_CFLAGS = \
122 $(global_cflags) \ 122 $(global_cflags) \
123 $(GLOBALDEPS_CFLAGS) \ 123 $(GLOBALDEPS_CFLAGS) \
124 $(UNICODE_CFLAGS) \ 124 $(UNICODE_CFLAGS) \
125 -fstrict-aliasing 125 -fno-strict-aliasing
126 126
127libJavaScriptCore_la_CPPFLAGS = \ 127libJavaScriptCore_la_CPPFLAGS = \
128 $(global_cppflags) \ 128 $(global_cppflags) \
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/packages/webkit/files/autogen.sh
index a929538d20..a929538d20 100644..100755
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/packages/webkit/files/autogen.sh
diff --git a/meta/packages/webkit/files/configure.ac b/meta/packages/webkit/files/configure.ac
index 64f32dc689..3ab2baffb8 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/packages/webkit/files/configure.ac
@@ -263,11 +263,19 @@ AC_ARG_ENABLE(cross_document_messaging,
263 [],[enable_cross_document_messaging="yes"]) 263 [],[enable_cross_document_messaging="yes"])
264AC_MSG_RESULT([$enable_cross_document_messaging]) 264AC_MSG_RESULT([$enable_cross_document_messaging])
265 265
266# check whether to enable HTML5 client-side session and persitent storage support
267AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
268AC_ARG_ENABLE(dom_storage,
269 AC_HELP_STRING([--enable-dom-storage],
270 [enable HTML5 client-side session and persistent storage support [default=no]]),
271 [],[enable_dom_storage="no"])
272AC_MSG_RESULT([$enable_dom_storage])
273
266# check whether to build with database support 274# check whether to build with database support
267AC_MSG_CHECKING([whether to enable HTML5 client-side storage support]) 275AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support])
268AC_ARG_ENABLE(database, 276AC_ARG_ENABLE(database,
269 AC_HELP_STRING([--enable-database], 277 AC_HELP_STRING([--enable-database],
270 [enable HTML5 client-side storage support [default=yes]]), 278 [enable HTML5 client-side database storage support [default=yes]]),
271 [],[enable_database="yes"]) 279 [],[enable_database="yes"])
272AC_MSG_RESULT([$enable_database]) 280AC_MSG_RESULT([$enable_database])
273 281
@@ -498,6 +506,7 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
498# WebKit feature conditionals 506# WebKit feature conditionals
499AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) 507AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
500AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) 508AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
509AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
501AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) 510AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
502AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 511AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
503AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) 512AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
@@ -526,27 +535,28 @@ echo "
526WebKit was configured with the following options: 535WebKit was configured with the following options:
527 536
528Build configuration: 537Build configuration:
529 Enable debugging (slow) : $enable_debug 538 Enable debugging (slow) : $enable_debug
530 Code coverage support : $enable_coverage 539 Code coverage support : $enable_coverage
531 Unicode backend : $unicode_backend 540 Unicode backend : $unicode_backend
532 HTTP backend : $with_http_backend 541 HTTP backend : $with_http_backend
533 Font backend : $with_font_backend 542 Font backend : $with_font_backend
534 Optimized memory allocator : $enable_fast_malloc 543 Optimized memory allocator : $enable_fast_malloc
535Features: 544Features:
536 HTML5 cross-document messaging : $enable_cross_document_messaging 545 HTML5 cross-document messaging : $enable_cross_document_messaging
537 HTML5 client-side storage support : $enable_database 546 HTML5 client-side session and persistent storage support : $enable_dom_storage
538 HTML5 video element support : $enable_video 547 HTML5 client-side database storage support : $enable_database
539 Icon database support : $enable_icon_database 548 HTML5 video element support : $enable_video
540 SVG support : $enable_svg 549 Icon database support : $enable_icon_database
541 SVG animation support : $enable_svg_animation 550 SVG support : $enable_svg
542 SVG filters support : $enable_svg_filters 551 SVG animation support : $enable_svg_animation
543 SVG fonts support : $enable_svg_fonts 552 SVG filters support : $enable_svg_filters
544 SVG foreign object support : $enable_svg_foreign_object 553 SVG fonts support : $enable_svg_fonts
545 SVG as image support : $enable_svg_as_image 554 SVG foreign object support : $enable_svg_foreign_object
546 SVG use element support : $enable_svg_use_element 555 SVG as image support : $enable_svg_as_image
547 XPATH support : $enable_xpath 556 SVG use element support : $enable_svg_use_element
548 XSLT support : $enable_xslt 557 XPATH support : $enable_xpath
558 XSLT support : $enable_xslt
549GTK+ configuration: 559GTK+ configuration:
550 GDK target : $with_target 560 GDK target : $with_target
551 Hildon UI extensions : $with_hildon 561 Hildon UI extensions : $with_hildon
552" 562"
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index c7a49fdd2f..2e7a0885c0 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -4,7 +4,7 @@ SRCREV_FORMAT = "webcore-rwebkit"
4 4
5# Yes, this is wrong... 5# Yes, this is wrong...
6PV = "0.1+svnr${SRCREV}" 6PV = "0.1+svnr${SRCREV}"
7PR = "r4" 7PR = "r5"
8 8
9SRC_URI = "\ 9SRC_URI = "\
10 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ 10 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -27,7 +27,6 @@ inherit autotools pkgconfig
27EXTRA_OECONF = "\ 27EXTRA_OECONF = "\
28 --enable-debug=no \ 28 --enable-debug=no \
29 --enable-svg \ 29 --enable-svg \
30 --enable-svg-fonts \
31 --enable-icon-database=yes \ 30 --enable-icon-database=yes \
32 " 31 "
33 32