Please merge webkit 1.1.12-1 from Debian sid

[Fabrice Coutadeur]

Hi,

Webkit 1.1.12-1 is a build dependency for epiphany-webkit, so please merge it.

Here is the Debian changelog:
 webkit (1.1.12-1) unstable; urgency=low

   * New upstream release
   * debian/copyright:
   - updated with changes since 1.1.10
   * debian/libwebkit-1.0-2.symbols:
   - adding new symbols

 -- Gustavo Noronha Silva <email address hidden> Tue, 28 Jul 2009 21:04:56 +0200

Thanks,

Fabrice

[Ying-Chun Liu (paulliu)]

I put the newer version to
https://launchpad.net/~paulliu/+archive/ppa2/+files/webkit_1.1.12-1ubuntu1.dsc

[Fabrice Coutadeur (fabricesp)]

Attaching your debdiff for sponsoring

[Daniel Holbach (dholbach)]

The merge generally looks fine, but I'd somehow prefer to know where the patch comes from.

https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines
Ying-Chun: could you please add a note about where the patch comes from? Is it from upstream? Will it go upstream?

Also does it seem to add API in which case we'd need to update the symbols file, no?

[Ying-Chun Liu (paulliu)]

Sorry for late reply.

I need more time to invetigate what happen to the patch actually.

The patch add some API and is mainly used by anjal.
So it's from Anjal http://git.gnome.org/cgit/anjal/tree/webkit.patch

However, RedHat also has the same bug https://bugzilla.redhat.cohttps://bugzilla.redhat.com/show_bug.cgi?id=507837
And it seems that upstream https://bugs.webkit.org/show_bug.cgi?id=17154 already do something.
And the changes should be already shipped with webkit 1.1.12

So now I have to look into anjal to see if it still need that patch. If no, we can sync from Debian.

[Daniel Holbach (dholbach)]

Erm.... http://git.gnome.org/cgit/anjal/tree/webkit.patch is identical to the patch that we use and identical to the patch in https://bugzilla.redhat.com/show_bug.cgi?id=507837 but how is it identical to https://bugs.webkit.org/show_bug.cgi?id=17154 ?

Can we please use https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines in the patch?

[Ying-Chun Liu (paulliu)]

I'm attaching a new debdiff which uses PatchTagging.
symbol files are also modified to point to 1.1.12.

Thanks.

[Ying-Chun Liu (paulliu)]

This patch comes from anjal.
It's still not reported to webkit upstream.
I've ask the author few weeks ago. He said he will do that but he is busy then.
I think I'll try to ask him again.

[Daniel Holbach (dholbach)]

Maybe we need to forward it upstream then.

[Daniel Holbach (dholbach)]

I'm not sure about the symbols patch - we did have
 - webkit_web_frame_execute_command@Base
 - webkit_web_frame_get_height@Base
 - webkit_web_frame_is_cursor_at_blockquote@Base
in 1.1.10 already. Didn't we?

[Daniel Holbach (dholbach)]

Otherwise the merge looks good to me.

[Ying-Chun Liu (paulliu)]

OK. Thank you Daniel.
I've re-attached the debdiff.

[Daniel Holbach (dholbach)]

Somebody please try to get the patch upstream as soon as possible. It will be a major pain maintaining a different API than upstream forever.

[Daniel Holbach (dholbach)]

Please use "(LP: #411263)" instead of "(LP: 411263)" next time around. :-)