[oe-commits] Thomas Zimmermann : Fixed reciepes for midori 0.1.8, webkit-efl and reciepe for webkit-gtk 1.1.4

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: bbd086156c3ff59d37371aef3b04ab6410a652bd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bbd086156c3ff59d37371aef3b04ab6410a652bd

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Mon Sep  7 16:42:27 2009 +0000

Fixed reciepes for midori 0.1.8, webkit-efl and reciepe for webkit-gtk 1.1.4

---

 conf/distro/include/preferred-shr-versions.inc |    2 +-
 recipes/gtk-webcore/midori_0.1.8.bb            |   13 +++++
 recipes/webkit/webkit-efl_git.bb               |   15 ++++---
 recipes/webkit/webkit-gtk_1.1.4.bb             |   57 ++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 740d2f0..db19b0c 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1229,7 +1229,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.1.2"
+PREFERRED_VERSION_midori ?= "0.1.8"
 PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2"
diff --git a/recipes/gtk-webcore/midori_0.1.8.bb b/recipes/gtk-webcore/midori_0.1.8.bb
new file mode 100644
index 0000000..092cae2
--- /dev/null
+++ b/recipes/gtk-webcore/midori_0.1.8.bb
@@ -0,0 +1,13 @@
+require midori.inc
+
+DEPENDS += "python-native librsvg"
+
+SRC_URI = "\
+	http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2\
+	file://ua-iphone.patch;patch=1\
+"
+
+PR = "r0"
+
+CC += "-lstdc++"
+
diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb
index 88770f3..33b8a8a 100644
--- a/recipes/webkit/webkit-efl_git.bb
+++ b/recipes/webkit/webkit-efl_git.bb
@@ -1,18 +1,21 @@
 DESCRIPTION = " Webkit browser engine, EFL edition"
 LICENSE = "GPL"
-PV="0.0.1"
+PV="0.1"
 PR="r0"
-DEPENDS = "icu gst-plugins-base gstreamer jpeg libpng libxml2 pango libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl sqlite libxslt gperf-native"
 
-SRC_URI = "git://code.staikos.net/webkit;branch=kenneth/efl-port;protocol=git"
+DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl sqlite libxslt gperf-native libxt"
+
+SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;tag=webkit-efl-${PV}"
 
 S= "${WORKDIR}/git"
 
 inherit autotools lib_package pkgconfig
 
-EXTRA_OECONF = "--with-port=efl --enable-web-workers=no"
+EXTRA_OECONF = "--disable-video --host=${TARGET_SYS} --with-port=efl --enable-web-workers=no"
 
-do_configure() {
-	sh autogen.sh --host=${TARGET_SYS}
+do_stage() {
+    autotools_stage_all
 }
 
+PACKAGES =+ "${PN}-webinspector"
+FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"
diff --git a/recipes/webkit/webkit-gtk_1.1.4.bb b/recipes/webkit/webkit-gtk_1.1.4.bb
new file mode 100644
index 0000000..2c9f07e
--- /dev/null
+++ b/recipes/webkit/webkit-gtk_1.1.4.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "WebKit browser engine, GTK+ edition"
+DEPENDS = "libsoup-2.4 icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3"
+
+SRCREV_FORMAT = "webcore-rwebkit"
+
+PR = "r1"
+
+SRC_URI = "\
+	http://www.webkitgtk.org/webkit-${PV}.tar.gz \
+ "
+
+S = "${WORKDIR}/webkit-${PV}"
+
+inherit autotools pkgconfig lib_package
+
+export BISON="${STAGING_BINDIR_NATIVE}/bison"
+ARM_INSTRUCTION_SET = "arm"
+EXTRA_OECONF = "\
+                --enable-debug=no \
+                --enable-svg \
+                --enable-icon-database=yes \
+		--with-http-backend=soup \
+               "
+EXTRA_AUTORECONF = " -I autotools "
+
+# Dolt gets used on x86 and ppc and hardcodes 'libtool'
+do_configure_append() {
+	cp ${TARGET_PREFIX}libtool libtool || true
+}
+
+do_compile_prepend() {
+        mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+        mkdir -p ${S}/Programs/
+	cd ${S}/JavaScriptCore/pcre
+        if test -e dftables.c
+        then
+            ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+        elif test -e dftables.cpp
+        then
+            ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
+        fi
+        cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+        cp dftables ${S}/Programs/        
+	cd ${S}
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
+FILES_${PN}launcher = "${bindir}/GtkLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
+FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
+FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"
+
+