Bug 117889 - [GTK][Stable] Merge r150008 into the webkit-2.0 branch
Summary: [GTK][Stable] Merge r150008 into the webkit-2.0 branch
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zan Dobersek
URL:
Keywords: Gtk
Depends on:
Blocks:
 
Reported: 2013-06-21 12:31 PDT by Zan Dobersek
Modified: 2013-06-24 00:53 PDT (History)
1 user (show)

See Also:

Attachments
Patch (3.89 KB, patch)
2013-06-21 12:37 PDT, Zan Dobersek 		cgarcia: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Zan Dobersek 2013-06-21 12:31:13 PDT 
r150008 is required to fix missing symbols in the WebKitPluginProcess that's built from the webkit-2.0 branch. A modified patch of that revision is required as there for instance is no libPlatform.la or libANGLE.la in the stable branch.
Comment 1 Zan Dobersek 2013-06-21 12:37:11 PDT 
Created attachment 205208 [details]
Patch
Comment 2 Zan Dobersek 2013-06-21 12:38:46 PDT 
Based off r150008, the patch only applies to the webkit-2.0 branch.
http://trac.webkit.org/changeset/150008

r150884 and r151492 should also be applied afterwards and will be added to the wiki page as proposed merges.
http://trac.webkit.org/changeset/150884
http://trac.webkit.org/changeset/151492
Comment 3 Carlos Garcia Campos 2013-06-24 00:49:11 PDT 
Comment on attachment 205208 [details]
Patch

I'll merge it in the stable branch, thanks!
Comment 4 Carlos Garcia Campos 2013-06-24 00:53:23 PDT 
Merged <http://trac.webkit.org/changeset/151895>