Bug 117889

Summary: [GTK][Stable] Merge r150008 into the webkit-2.0 branch
Product: WebKit Reporter: Zan Dobersek <zan>
Component: WebKitGTKAssignee: Zan Dobersek <zan>
Status: RESOLVED FIXED    
Severity: Normal CC: cgarcia
Priority: P2 Keywords: Gtk
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch cgarcia: review+

Zan Dobersek
Reported 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.
Attachments
Patch (3.89 KB, patch)
2013-06-21 12:37 PDT, Zan Dobersek 		cgarcia: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Zan Dobersek
Comment 1 2013-06-21 12:37:11 PDT
Created attachment 205208 [details] Patch
Zan Dobersek
Comment 2 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
Carlos Garcia Campos
Comment 3 2013-06-24 00:49:11 PDT
Comment on attachment 205208 [details] Patch I'll merge it in the stable branch, thanks!
Carlos Garcia Campos
Comment 4 2013-06-24 00:53:23 PDT
Merged <http://trac.webkit.org/changeset/151895>
Note You need to log in before you can comment on or make changes to this bug.