| Submitter | Koen Kooi |
|---|---|
| Date | June 24, 2011, 2 p.m. |
| Message ID | <1308924042-12173-1-git-send-email-koen@dominion.thruhere.net> |
| Download | mbox | patch |
| Permalink | /patch/6479/ |
| State | New, archived |
| Headers | show |
Comments
ping Op 24 jun 2011, om 16:00 heeft Koen Kooi het volgende geschreven: > Somewhere in the past webkit changed from webkit-x to webkitgtk-x but the person updating the recipe didn't catch that > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > meta/recipes-sato/webkit/webkit-gtk_svn.bb | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb > index 6d134ad..af43ae8 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 = "webcore-rwebkit" > > SRCREV = "72836" > PV = "1.3.7+svnr${SRCPV}" > -PR = "r1" > +PR = "r2" > > SRC_URI = "\ > svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ > @@ -71,8 +71,9 @@ PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcor > 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/" > -FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images" > - > +FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" > +FILES_${PN} += "${datadir}/webkit-*/resources/error.html \ > + ${datadir}/webkitgtk-*/images \ > + ${datadir}/glib-2.0/schemas" > > > -- > 1.6.6.1 >
On Fri, 2011-06-24 at 16:00 +0200, Koen Kooi wrote: > Somewhere in the past webkit changed from webkit-x to webkitgtk-x but the person updating the recipe didn't catch that > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb index 6d134ad..af43ae8 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 = "webcore-rwebkit" SRCREV = "72836" PV = "1.3.7+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -71,8 +71,9 @@ PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcor 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/" -FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images" - +FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" +FILES_${PN} += "${datadir}/webkit-*/resources/error.html \ + ${datadir}/webkitgtk-*/images \ + ${datadir}/glib-2.0/schemas"
Somewhere in the past webkit changed from webkit-x to webkitgtk-x but the person updating the recipe didn't catch that Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/recipes-sato/webkit/webkit-gtk_svn.bb | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)