[PATCH 1/2] webkit-gtk: Fix error.html resource path.

[PATCH 1/2] webkit-gtk: Fix error.html resource path.

[Peter Tworek]

Signed-off-by: Peter Tworek <tworaz666@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 meta/recipes-sato/webkit/webkit-gtk_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 9652953..92ceb50 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -81,7 +81,7 @@ 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}/webkit-*/resources/error.html \
+FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
                 ${datadir}/webkitgtk-*/images \
                 ${datadir}/glib-2.0/schemas"
 
-- 
1.7.3.4

[PATCH 2/2] webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.

[Peter Tworek]

* Add missing dependency on virtual/libgl.
* Make webgl configurable via DISTRO_FEATURES="opengl".
* Run tested on netbook pro.

Signed-off-by: Peter Tworek <tworaz666@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 meta/recipes-sato/webkit/webkit-gtk_svn.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 92ceb50..2d9ec80 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -8,13 +8,14 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
 
 DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
+DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
 DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
 
 SRCREV_FORMAT = "source"
 
 SRCREV = "101488"
 PV = "1.7.2+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -41,6 +42,7 @@ EXTRA_OECONF = "\
                 --enable-image-resizer \
                 --enable-link-prefetch \
                 --with-gtk=2.0 \
+                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
                 UNICODE_CFLAGS=-D_REENTRANT \
                "
 
-- 
1.7.3.4

Re: [PATCH 1/2] webkit-gtk: Fix error.html resource path.

[Koen Kooi]

Op 4 feb. 2012, om 00:32 heeft Peter Tworek het volgende geschreven:

> Signed-off-by: Peter Tworek <tworaz666@gmail.com>
> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

missing PR bump

Re: [PATCH 1/2] webkit-gtk: Fix error.html resource path.

[Peter Tworek]

On 02/04/2012 01:34 AM, Koen Kooi wrote:
> Op 4 feb. 2012, om 00:32 heeft Peter Tworek het volgende geschreven:
>
>> Signed-off-by: Peter Tworek<tworaz666@gmail.com>
>> Reviewed-by: Paul Menzel<paulepanter@users.sourceforge.net>
> missing PR bump
Yep, bumped in patch 2/2. Do you want me to bump it in each one?

/ptw

Re: [PATCH 1/2] webkit-gtk: Fix error.html resource path.

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

Am Samstag, den 04.02.2012, 01:59 +0100 schrieb Peter Tworek:
> On 02/04/2012 01:34 AM, Koen Kooi wrote:
> > Op 4 feb. 2012, om 00:32 heeft Peter Tworek het volgende geschreven:
> >
> >> Signed-off-by: Peter Tworek<tworaz666@gmail.com>
> >> Reviewed-by: Paul Menzel<paulepanter@users.sourceforge.net>
> > missing PR bump
> Yep, bumped in patch 2/2. Do you want me to bump it in each one?

Yes, please do that for people testing each commit for example.


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]