| 1 | [[PageOutline]] |
| 2 | |
| 3 | = Preparing for 2.6.0 = |
| 4 | |
| 5 | WebkitGtk+ '''2.6.0''' will be the next release in the stable series (following [wiki:WebKitGTK/2.4.x 2.4.x]). We should merge not overly intrusive patches that improve stability or performance, fix build issues, etc. We branched at r173752 (19/09/14). |
| 6 | |
| 7 | When filing bugs (http://bugs.webkit.org) against stable release, please prefix them with "[GTK] [Stable]" to ensure they are addressed with high |
| 8 | priority. Also, running a debug build and including stack traces is highly encouraged. |
| 9 | |
| 10 | To get the stable branch code, simply check out |
| 11 | http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6 |
| 12 | |
| 13 | Over the next few weeks we'll be merging important fixes into the |
| 14 | branch, so be sure to stay up to date. Thanks for your help! |
| 15 | |
| 16 | == Proposed merges for 2.5.90 == |
| 17 | |
| 18 | * https://bugs.webkit.org/show_bug.cgi?id=136632 ''Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable'' |
| 19 | |
| 20 | == Changes on track == |
| 21 | |
| 22 | * https://bugs.webkit.org/show_bug.cgi?id=136692 ''Race condition with WebKitWebView:is-loading after starting page load'' |
| 23 | |
| 24 | = Previous versions = |
| 25 | For changes in older stable branches see: [wiki:WebKitGTK/2.4.x 2.4.x] |
| 26 | |
| 27 | = Useful commands = |
| 28 | |
| 29 | To get a wiki-formated list of commits that just got merged: |
| 30 | |
| 31 | {{{ |
| 32 | $ git log --pretty=oneline <commit>.. | cut -d ' ' -f 5- | sed "s,\(.\+\)\(https://bugs.*\), * ~~[\2] ''\1''~~," |
| 33 | }}} |
| 34 | |
| 35 | = How to add a webkit-2.6 branch to existing git-svn clone = |
| 36 | |
| 37 | If you have already cloned git://git.webkit.org/WebKit.git, it only contains a git-svn clone of the svn trunk. To add webkit-2.6 branch to there, add a new remote to .git/config: |
| 38 | {{{ |
| 39 | [svn-remote "webkit-2.6"] |
| 40 | url = http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6 |
| 41 | fetch = :refs/remotes/git-svn-webkit-2.6 |
| 42 | }}} |
| 43 | |
| 44 | and run the following commands: |
| 45 | {{{ |
| 46 | git svn fetch webkit-2.6 -r 173752 |
| 47 | git branch webkit-2.6 git-svn-webkit-2.6 |
| 48 | git checkout webkit-2.6 |
| 49 | git svn rebase |
| 50 | }}} |