Patchwork [2/2] webkit-gtk: update to 1.8.2

login
register
mail settings
Submitter Andreas Müller
Date Aug. 17, 2012, 8:55 a.m.
Message ID <1345193717-23225-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/34791/
State Accepted
Headers show

Comments

Andreas Müller - Aug. 17, 2012, 8:55 a.m.
run tested with midori 0.4.5:
* google maps
* google mail (https)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{webkit-gtk_1.8.1.bb => webkit-gtk_1.8.2.bb}   |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
 rename meta/recipes-sato/webkit/{webkit-gtk_1.8.1.bb => webkit-gtk_1.8.2.bb} (96%)
Ross Burton - Aug. 17, 2012, 9 a.m.
On 17 August 2012 09:55, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> -SRC_URI[md5sum] = "f2f01b1fdc7262a2eede81ebed0970b2"
> -SRC_URI[sha256sum] = "9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28"
> +SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c"
> +SRC_URI[sha256sum] = "0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6"

I've got this patch in a branch too, but I was... concerned by the
hashes of the tarballs not matching the hashes in the release mail.  I
mailed the person who sent the release announcement but no reply.

Did you chase upstream about this -- I presume it's a genuine mistake
(maybe the tarball was re-generated) but I'm curious.

Ross
Andreas Müller - Aug. 17, 2012, 9:05 a.m.
On Fri, Aug 17, 2012 at 11:00 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 17 August 2012 09:55, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>> -SRC_URI[md5sum] = "f2f01b1fdc7262a2eede81ebed0970b2"
>> -SRC_URI[sha256sum] = "9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28"
>> +SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c"
>> +SRC_URI[sha256sum] = "0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6"
>
> I've got this patch in a branch too, but I was... concerned by the
> hashes of the tarballs not matching the hashes in the release mail.  I
> mailed the person who sent the release announcement but no reply.
>
> Did you chase upstream about this -- I presume it's a genuine mistake
> (maybe the tarball was re-generated) but I'm curious.
>
> Ross
I did
* use the 1.8.1 hashes and let oe tell me the new ones
* add new hashes in recipe
* bitbake -ccleanall webkit-gtk
* bitbake webkit-gtk

Andreas
Ross Burton - Aug. 17, 2012, 10:13 a.m.
On 17 August 2012 10:05, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>> Did you chase upstream about this -- I presume it's a genuine mistake
>> (maybe the tarball was re-generated) but I'm curious.
>>
>> Ross
> I did
> * use the 1.8.1 hashes and let oe tell me the new ones
> * add new hashes in recipe
> * bitbake -ccleanall webkit-gtk
> * bitbake webkit-gtk

That's what I did, but that doesn't mitigate the point that we should
be validating checksums where possible.  I just grabbed someone on IRC
and they think that the checksums in the mail are for the wrong
tarball... :)

Ross
Ross Burton - Aug. 17, 2012, 10:15 a.m.
http://lists.webkit.org/pipermail/webkit-gtk/2012-August/001192.html
for anyone who really cares.

As I have an identical patch to this locally:

Acked-By: Ross Burton <ross.burton@intel.com>

Ross
Richard Purdie - Aug. 17, 2012, 12:08 p.m.
On Fri, 2012-08-17 at 10:55 +0200, Andreas Müller wrote:
> run tested with midori 0.4.5:
> * google maps
> * google mail (https)
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../{webkit-gtk_1.8.1.bb => webkit-gtk_1.8.2.bb}   |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
>  rename meta/recipes-sato/webkit/{webkit-gtk_1.8.1.bb => webkit-gtk_1.8.2.bb} (96%)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
similarity index 96%
rename from meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
rename to meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
index afd3a7a..1d1419e 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
@@ -7,8 +7,6 @@  LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
                     file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
 
-PR = "r1"
-
 # Choice of language backends - icu has issues on Big Endian machines so use pango
 ICU_LIB = "icu"
 ICU_LIB_powerpc = "pango"
@@ -17,8 +15,6 @@  DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl libxml2 cairo libxslt lib
            gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
 DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
 
-PR = "r1"
-
 SRC_URI = "\
   http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \
   file://nodolt.patch \
@@ -26,8 +22,8 @@  SRC_URI = "\
   file://webgit-gtk_fix_build_with_automake_1.12.patch \
  "
 
-SRC_URI[md5sum] = "f2f01b1fdc7262a2eede81ebed0970b2"
-SRC_URI[sha256sum] = "9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28"
+SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c"
+SRC_URI[sha256sum] = "0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6"
 
 inherit autotools lib_package gtk-doc pkgconfig