From 570e5e20623031ad03cce470fc3d94d9a5b05827 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 13 Feb 2013 13:25:07 +0200 Subject: webkit-gtk: update to upstream version 1.8.3 Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb | 116 --------------------------- meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 +++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb create mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb deleted file mode 100644 index 1789d4d3e0..0000000000 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb +++ /dev/null @@ -1,116 +0,0 @@ -DESCRIPTION = "WebKitGTK+ is the port of the portable web rendering engine WebKitK to the GTK+ platform." -HOMEPAGE = "http://www.webkitgtk.org/" -BUGTRACKER = "http://bugs.webkit.org/" - -LICENSE = "BSD & LGPLv2+" -LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ - file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ - file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" - -PR = "r3" - -# Choice of language backends - icu has issues on Big Endian machines so use pango -ICU_LIB = "icu" -ICU_LIB_powerpc = "pango" - -DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" -DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" - -SRC_URI = "\ - http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ - file://nodolt.patch \ - file://no-gtkdoc.patch \ - file://webgit-gtk_fix_build_with_automake_1.12.patch \ - file://bison-2.6.patch \ - " - -SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c" -SRC_URI[sha256sum] = "0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6" - -inherit autotools lib_package gtk-doc pkgconfig - -S = "${WORKDIR}/webkit-${PV}/" - -EXTRA_OECONF = "\ - --enable-debug=no \ - --enable-svg \ - --enable-icon-database=yes \ - --enable-fullscreen-api \ - --enable-image-resizer \ - --enable-link-prefetch \ - --with-gtk=2.0 \ - --disable-geolocation \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ - UNICODE_CFLAGS=-D_REENTRANT \ - " - -#default unicode backend icu breaks in cross-compile when target and host are different endian type -EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib" - -CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \ - -I${STAGING_LIBDIR}/glib-2.0/include \ - -I${STAGING_INCDIR}/glib-2.0" - -EXTRA_AUTORECONF = " -I Source/autotools " - - -#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]': -#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle::ExternalType JSC::Handle::get() const [with T = JSC::Structure, JSC::Handle::ExternalType = JSC::Structure*]' -#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here -#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align] -#| {standard input}: Assembler messages: -#| {standard input}:28873: Error: invalid immediate: 983040 is out of range -#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110 -#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819 -#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as) -#| Please submit a full bug report, -#| with preprocessed source if appropriate. -#| See for instructions. -#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1 -#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0' -ARM_INSTRUCTION_SET = "arm" - -CONFIGUREOPT_DEPTRACK = "" - -do_configure_append() { - # somethings wrong with icu, fix it up manually - for makefile in $(find ${S} -name "GNUmakefile") ; do - sed -i s:-I/usr/include::g $makefile - done -} - -# A dirty hack for GNU make 3.82 bug which means it drops required -# dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+ -# bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug. This is -# fixed in Make CVS, so 3.83 won't have this problem. -do_compile() { - if [ x"$MAKE" = x ]; then MAKE=make; fi - bbnote ${MAKE} ${EXTRA_OEMAKE} "$@" - for error_count in 1 2 3; do - bbnote "Attempt $error_count of 3" - exit_code=0 - ${MAKE} ${EXTRA_OEMAKE} "$@" || exit_code=1 - if [ $exit_code = 0 ]; then - break - fi - done - if [ ! $exit_code = 0 ]; then - die "oe_runmake failed" - fi -} - -do_install_append() { - rmdir ${D}${libexecdir} -} - -PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" -FILES_${PN}launcher = "${bindir}/GtkLauncher" -FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" -FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*" -FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" -FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \ - ${datadir}/webkitgtk-*/images \ - ${datadir}/glib-2.0/schemas" - - diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb new file mode 100644 index 0000000000..66a30f8778 --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb @@ -0,0 +1,116 @@ +DESCRIPTION = "WebKitGTK+ is the port of the portable web rendering engine WebKitK to the GTK+ platform." +HOMEPAGE = "http://www.webkitgtk.org/" +BUGTRACKER = "http://bugs.webkit.org/" + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ + file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" + +PR = "r0" + +# Choice of language backends - icu has issues on Big Endian machines so use pango +ICU_LIB = "icu" +ICU_LIB_powerpc = "pango" + +DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ + gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" +DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" + +SRC_URI = "\ + http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ + file://nodolt.patch \ + file://no-gtkdoc.patch \ + file://webgit-gtk_fix_build_with_automake_1.12.patch \ + file://bison-2.6.patch \ + " + +SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" +SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" + +inherit autotools lib_package gtk-doc pkgconfig + +S = "${WORKDIR}/webkit-${PV}/" + +EXTRA_OECONF = "\ + --enable-debug=no \ + --enable-svg \ + --enable-icon-database=yes \ + --enable-fullscreen-api \ + --enable-image-resizer \ + --enable-link-prefetch \ + --with-gtk=2.0 \ + --disable-geolocation \ + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ + UNICODE_CFLAGS=-D_REENTRANT \ + " + +#default unicode backend icu breaks in cross-compile when target and host are different endian type +EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib" + +CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_LIBDIR}/glib-2.0/include \ + -I${STAGING_INCDIR}/glib-2.0" + +EXTRA_AUTORECONF = " -I Source/autotools " + + +#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]': +#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle::ExternalType JSC::Handle::get() const [with T = JSC::Structure, JSC::Handle::ExternalType = JSC::Structure*]' +#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here +#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align] +#| {standard input}: Assembler messages: +#| {standard input}:28873: Error: invalid immediate: 983040 is out of range +#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110 +#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819 +#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as) +#| Please submit a full bug report, +#| with preprocessed source if appropriate. +#| See for instructions. +#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1 +#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0' +ARM_INSTRUCTION_SET = "arm" + +CONFIGUREOPT_DEPTRACK = "" + +do_configure_append() { + # somethings wrong with icu, fix it up manually + for makefile in $(find ${S} -name "GNUmakefile") ; do + sed -i s:-I/usr/include::g $makefile + done +} + +# A dirty hack for GNU make 3.82 bug which means it drops required +# dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+ +# bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug. This is +# fixed in Make CVS, so 3.83 won't have this problem. +do_compile() { + if [ x"$MAKE" = x ]; then MAKE=make; fi + bbnote ${MAKE} ${EXTRA_OEMAKE} "$@" + for error_count in 1 2 3; do + bbnote "Attempt $error_count of 3" + exit_code=0 + ${MAKE} ${EXTRA_OEMAKE} "$@" || exit_code=1 + if [ $exit_code = 0 ]; then + break + fi + done + if [ ! $exit_code = 0 ]; then + die "oe_runmake failed" + fi +} + +do_install_append() { + rmdir ${D}${libexecdir} +} + +PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" +FILES_${PN}launcher = "${bindir}/GtkLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" +FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*" +FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" +FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \ + ${datadir}/webkitgtk-*/images \ + ${datadir}/glib-2.0/schemas" + + -- cgit 1.2.3-korg