[[PageOutline]]

= Preparing for 2.26.0 =

WebKitGTK and WPE '''2.26.0''' will be the next release in the stable series (following  [wiki:WebKitGTK/2.24.x 2.24.x]). We should merge not overly intrusive patches that improve stability or performance, fix build issues, etc. We branched at r 249195 (28/08/19).

When filing bugs (http://bugs.webkit.org) against stable release, please prefix them with "[GTK] [Stable]" (or "[WPE] [Stable]") to ensure they are addressed with high priority. Also, running a debug build and including stack traces is highly encouraged. (Don't use "[Stable]" if the bug also applies to master, though.)

To get the stable branch code, simply check out
http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.26
Over the next few weeks we'll be merging important fixes into the
branch, so be sure to stay up to date. Thanks for your help!

== Proposed merges for 2.26.5 ==

 * ~~https://trac.webkit.org/changeset/257292 ''PS-2019-006: [GTK] WebKit - AXObjectCache - m_deferredFocusedNodeChange - UaF''~~
 * ~~https://trac.webkit.org/changeset/256703 ''[Geoclue] Avoid usage of provider in callbacks after it has been destroyed''~~
 * ~~https://trac.webkit.org/changeset/258143 ''Tail calls are broken on ARM_THUMB2 and MIPS''~~
 * ~~https://trac.webkit.org/changeset/254680 ''Do not detect the stopped animations in Nicosia::Animation to avoid flashback''~~
   * Backport (if it doesn't apply cleanly) at: https://github.com/Igalia/meta-webkit/blob/master/recipes-browser/wpewebkit/wpewebkit/Do-not-detect-the-stopped-animations.patch

== Proposed merges for 2.26.4 ==

 * ~~https://trac.webkit.org/changeset/250077 ''[GTK] Compilation errors when GL is disabled''~~
 * ~~https://trac.webkit.org/changeset/255824 ''[GTK] Cannot perform most local loads with sandbox enabled''~~
 * ~~https://trac.webkit.org/changeset/255865 ''[GTK] Add more fontconfig paths to sandbox''~~
 * ~~https://trac.webkit.org/changeset/256491 ''Multiple GCC 10 build failures in ANGLE''~~

== Proposed merges for 2.26.3 ==

 * ~~https://trac.webkit.org/changeset/251680 ''Hidden framesets should provide default edgeInfo value''~~
 * ~~https://trac.webkit.org/changeset/250743 ''Unreviewed WinCairo build fix for r250717.'' (not WinCairo-specific)~~
 * ~~https://trac.webkit.org/changeset/250747 ''Fails to build with icu 65.1''~~
 * ~~https://trac.webkit.org/changeset/252398 ''[GStreamer] Several issues while trying to play a video on NextCloud''~~
 * ~~https://trac.webkit.org/changeset/253284 ''[GStreamer] Crashes in MediaPlayerPrivateGStreamer::ensureGstGLContext''~~

== Proposed merges for 2.26.2 ==

 * ~~https://trac.webkit.org/changeset/251771 ''ImageDecoders: use a thread safe data buffer for Cairo backing store''~~
 * ~~https://trac.webkit.org/changeset/251836 ''[GTK][WPE] ImageDecoders: use SharedBuffer::DataSegment instead of SharedBuffer''~~
 * ~~https://trac.webkit.org/changeset/252044 ''[FreeType] Too slow running encoding/legacy-mb-korean/euc-kr WPT tests''~~
 * ~~https://trac.webkit.org/changeset/250231 ''[GTK][WPE] Don't use prgname in dbus-proxy socket path''~~
 * ~~https://trac.webkit.org/changeset/250298 ''[GTK] ANGLE's eglplatform.h is build broken with -DENABLE_X11_PLATFORM=OFF''~~
 * ~~https://trac.webkit.org/changeset/250717 ''[GTK] Crash in WebChromeClient::createDisplayRefreshMonitor''~~
 * ~~https://trac.webkit.org/changeset/250818 ''[WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF''~~
 * ~~https://trac.webkit.org/changeset/250901 ''REGRESSION(r246399): [GStreamer] Problems playing AAC streams''~~

== Proposed merges for 2.26.1 ==

 * ~~https://trac.webkit.org/changeset/249810 ''[GTK][WPE] webkit_settings_set_user_agent() allows content forbidden in HTTP headers''~~
 * ~~https://trac.webkit.org/changeset/249890 ''REGRESSION(r249142): [GTK] Epiphany delayed page loads continue indefinitely''~~
 * ~~https://trac.webkit.org/changeset/249947 ''[GTK] Crash closing web view while hardware acceleration is enabled''~~
 * ~~https://trac.webkit.org/changeset/249951 ''[GTK] Cannot create EGL window surface: EGL_BAD_ALLOC''~~
 * ~~https://trac.webkit.org/changeset/250036 ''[GTK][WPE] bubblewrap sandbox should be disabled when running inside docker''~~
 * ~~https://trac.webkit.org/changeset/249883 ''[GTK][WPE] Do not run the Bubblewrap executable when configuring for cross-compilation'' ~~

== Proposed merges for 2.26.0 ==

 * ~~https://trac.webkit.org/changeset/249487 ''[WPE][GTK] Fix sandbox parsing DISPLAY on X11''~~
 * ~~https://trac.webkit.org/changeset/249569 ''[GTK][WPE] Do not enable the sandbox in Snap''~~
== Changes on track ==
   
= Previous versions = 
For changes in older stable branches see: [wiki:WebKitGTK/2.24.x 2.24.x]

= Useful commands =

To get a wiki-formated list of commits that just got merged:

{{{
 $ git log --pretty=oneline <commit>.. | cut -d ' ' -f 5- | sed "s,\(.\+\)\(https://bugs.*\),  * ~~[\2] ''\1''~~,"
}}}

= How to add a webkit-2.26 branch to existing git-svn clone =

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.26 branch to there, add a new remote to .git/config:
{{{
[svn-remote "webkit-2.26"]
    url = https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.26
    fetch = :refs/remotes/git-svn-webkit-2.26
}}}

and run the following commands:
{{{
git svn fetch webkit-2.26 -r 249195
git branch webkit-2.26 git-svn-webkit-2.26
git checkout webkit-2.26
git svn rebase
}}}