From 30c2729b7ee6b75b47fcf7895fd856d266ad2025 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 8 Nov 2010 07:47:27 -0500 Subject: webkit-gtk: fix packaging of error.html for svn release The resources under ${datadir} have moved around between versions. Use a wildcard in case they move again. No PR bump for v1.2.3. It already packages the correct file. Signed-off-by: Michael Smith --- recipes/webkit/webkit-gtk_1.2.3.bb | 4 ++-- recipes/webkit/webkit-gtk_svn.bb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/webkit/webkit-gtk_1.2.3.bb b/recipes/webkit/webkit-gtk_1.2.3.bb index 0ee6241279..e223a649ba 100644 --- a/recipes/webkit/webkit-gtk_1.2.3.bb +++ b/recipes/webkit/webkit-gtk_1.2.3.bb @@ -47,6 +47,6 @@ 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}/webkit*/webinspector/" +FILES_${PN} += "${datadir}/webkit*/resources/error.html ${datadir}/webkit*/images" diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index f6bb70848a..74fb33b7f9 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "geoclue enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl SRCREV_FORMAT = "webcore-rwebkit" -PR = "r0" +PR = "r1" SRCREV = "68244" PV = "1.3.4+svnr${SRCPV}" @@ -68,6 +68,6 @@ 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}/webkitgtk-1.0/webinspector/" -FILES_${PN} += "${datadir}/webkitgtk-1.0/resources/error.html ${datadir}/webkitgtk-1.0/images" +FILES_${PN}-webinspector = "${datadir}/webkit*/webinspector/" +FILES_${PN} += "${datadir}/webkit*/resources/error.html ${datadir}/webkit*/images" -- cgit 1.2.3-korg