Patchwork [1/2,v2] webkit-gtk: Fix error.html resource path.

login
register
mail settings
Submitter Peter Tworek
Date Feb. 4, 2012, 6:41 p.m.
Message ID <1328380901-11856-1-git-send-email-tworaz666@gmail.com>
Download mbox | patch
Permalink /patch/20701/
State Accepted
Commit cb0e0e3de421e2dd8335765adb3c0e442177bb9a
Headers show

Comments

Peter Tworek - Feb. 4, 2012, 6:41 p.m.
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, 2 insertions(+), 2 deletions(-)
Saul Wold - Feb. 8, 2012, 4:07 a.m.
On 02/04/2012 10:41 AM, Peter Tworek wrote:
> 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, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> index 9652953..d754a39 100644
> --- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> @@ -14,7 +14,7 @@ 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 \
> @@ -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"
>

Merged both of these patches into OE-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 9652953..d754a39 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -14,7 +14,7 @@  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 \
@@ -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"