[[PageOutline]] = Preparing for 2.2.0 = WebkitGtk+ '''2.2.0''' will be the next release in the stable series (following [wiki:WebKitGTK/2.0.x 2.0.x]). We should merge not overly intrusive patches that improve stability or performance, fix build issues, etc. We branched at r154665 (08/27/13). When filing bugs (http://bugs.webkit.org) against stable release, please prefix them with "[GTK] [Stable]" to ensure they are addressed with high priority. Also, running a debug build and including stack traces is highly encouraged. To get the stable branch code, simply check out http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.2 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.2.3 == * http://trac.webkit.org/changeset/159314 ''[Cairo] Avoid extra copy when drawing images'' * https://bugs.webkit.org/show_bug.cgi?id=124671 ''[GTK] Cannot scroll in option menu when it larger than the screen'' * http://trac.webkit.org/changeset/159572 ''[GTK] Remove Chromium as user agent and claim to be Safari in OS X'' -- see [[https://bugs.webkit.org/show_bug.cgi?id=124229|bug124229]], [[https://bugs.webkit.org/show_bug.cgi?id=124770|bug124770]] * http://trac.webkit.org/changeset/158687 ''Fix register allocation inside control flow in GetByVal String'' * https://bugs.webkit.org/show_bug.cgi?id=124967 ''[GTK] GTK2 paint code path does not render AC layers'' * https://bugs.webkit.org/show_bug.cgi?id=124954 ''REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false'' == Proposed merges for 2.2.2 == * ~~http://trac.webkit.org/changeset/156892 ''[GTK] Enable text edition UndoOperations support in WebKit2''~~ * ~~http://trac.webkit.org/changeset/158444 ''Fix build on non-linux platforms''~~ * ~~http://trac.webkit.org/changeset/158445 ''HPPA build fixes''~~ * ~~http://trac.webkit.org/changeset/159041 ''[GTK] [WebKit2] Crash when printing to a file via javascript''~~ * ~~http://trac.webkit.org/changeset/159042 ''[GTK] Crash when printing via javascript in WebKit2''~~ == Proposed merges for 2.2.1 == * ~~http://trac.webkit.org/changeset/154797 ''Source/JavaScriptCore: https://bugs.webkit.org/show_bug.cgi?id=119548''~~ * ~~http://trac.webkit.org/changeset/154824 ''CodeBlock compilation and installation should be simplified and rationalized''~~ * ~~http://trac.webkit.org/changeset/155495 ''WebKit crashes when trying to send a msg via 'today's birthdays' dialogue box on Facebook''~~ * ~~http://trac.webkit.org/changeset/156003 ''DFG doesn't properly keep scope alive for op_put_to_scope''~~ * ~~http://trac.webkit.org/changeset/156287 ''[GTK][WK2] A plugin dirtyRect within iframe remains after moving to a different page''~~ * ~~http://trac.webkit.org/changeset/156345 ''[GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE''~~ == Proposed merges for 2.2.0 == * ~~http://trac.webkit.org/changeset/156261 ''GTK build fix when building with GTK+ 2.0''~~ == Proposed merges for 2.1.92 == * ~~http://trac.webkit.org/changeset/155515 ''Unquoted $ORIGDIR in autogen.sh''~~ * ~~http://trac.webkit.org/changeset/155517 ''autogen.sh: fix removal of autom4te.cache''~~ * ~~http://trac.webkit.org/changeset/155533 ''[WK2] [GTK] LayerTreeHostGtk: don't set m_isValid to false if glContext() returns null''~~ * ~~http://trac.webkit.org/changeset/155677 ''download-requested arg should be WEBKIT_TYPE_DOWNLOAD not G_TYPE_OBJECT''~~ * ~~http://trac.webkit.org/changeset/155757 and http://trac.webkit.org/changeset/155772 ''[GTK] Fails to compile if the build directory is in a different partition''~~ * ~~http://trac.webkit.org/changeset/155758 ''Uses gtk-doc tools even when --disable-gtk-doc passed''~~ * ~~http://trac.webkit.org/changeset/155768 ''[GTK] WebKitGTK+ is linking against libxslt in too many places''~~ * ​~~http://trac.webkit.org/changeset/155778 ''Missing allow-none introspection annotation for DomDocument.evaluate method''~~ * ~~http://trac.webkit.org/changeset/155516 ''[GTK] Reimplement atk_text_get_text_*_offset for LINE boundaries''~~ * ~~http://trac.webkit.org/changeset/155031 ''[GTK] Reimplement atk_text_get_text_*_offset for SENTENCE boundaries''~~ * ~~http://trac.webkit.org/changeset/155520 ''[GTK] Get rid of Pango/Gail dependencies in accessibility for ATK''~~ * ~~http://trac.webkit.org/changeset/155534 ''[GTK] Remove Gail dependency from build system for GTK3''~~ == Proposed merges for 2.1.91 == * ~~http://trac.webkit.org/changeset/155104 ''[Qt][WK1] REGRESSION(r154988): compositing/video/video-with-invalid-source.html~~ * ~~http://trac.webkit.org/changeset/155049 ''REGRESSION(r154977): Do not urlencode soup message on ResourceRequest::toSoupMessage()''~~ * ~~http://trac.webkit.org/changeset/155024 ''[GStreamer] cannot play live streams''~~ * ~~http://trac.webkit.org/changeset/154988 ''[GStreamer] Don't set state to NULL until element is destroyed''~~ * ~~http://trac.webkit.org/changeset/154977 ''[gstreamer] Disable HTTP request "Accept-Encoding:" header field on gstreamer source element to avoid receiving the wrong size when retrieving data''~~ * ~~http://trac.webkit.org/changeset/154841 ''[GTK] Should enable WebGL by default on MiniBrowser''~~ * ~~http://trac.webkit.org/changeset/154683 ''[gstreamer] Make sure gstreamer source element is thread-safe''~~ * ~~http://trac.webkit.org/changeset/155066 '' [WK2][GTK] ASSERTION in WebKit::LayerTreeHostGtk::invalidate''~~ * ~~http://trac.webkit.org/changeset/154970 ''[GStreamer] Video player sets system volume to 100%''~~ * ~~http://trac.webkit.org/changeset/154944 ''Volume slider value should be 0 when audio is muted''~~ * ~~http://trac.webkit.org/changeset/155039 ''Color of input button's text broken with recent gnome-themes-standard''~~ * ~~http://trac.webkit.org/changeset/155032 ''[GTK] Add support for the Wayland build target''~~ * ~~http://trac.webkit.org/changeset/155193 ''[GTK] GlibUtilities: getCurrentExecutablePath() does not compile on GNU/Hurd''~~ * ~~http://trac.webkit.org/changeset/155210 ''GTest: add support for FreeBSD and Hurd''~~ * ~~http://trac.webkit.org/changeset/155245 ''[GTK] Bump the required Clang version to 3.2''~~ * ~~http://trac.webkit.org/changeset/154728 ''[GTK][WK2] Disable accelerated compositing under Wayland''~~ * ~~http://trac.webkit.org/changeset/155125 ''[WK2] [GTK] Remove the test to disable AC under Wayland from WebKitWebViewGroup''~~ * ~~http://trac.webkit.org/changeset/155329 ''[GTK] ghost cursor when mouse hovers over an image file in a tab''~~ == Changes on track == = Previous versions = For changes in older stable branches see: [wiki:WebKitGTK/2.0.x 2.0.x] = Useful commands = To get a wiki-formated list of commits that just got merged: {{{ $ git log --pretty=oneline .. | cut -d ' ' -f 5- | sed "s,\(.\+\)\(https://bugs.*\), * ~~[\2] ''\1''~~," }}} = How to add a webkit-2.2 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.2 branch to there, add a new remote to .git/config: {{{ [svn-remote "webkit-2.2"] url = http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.2 fetch = :refs/remotes/git-svn-webkit-2.2 }}} and run the following commands: {{{ git svn fetch webkit-2.2 -r 154665 git branch --track webkit-2.2 git-svn-webkit-2.2 git checkout webkit-2.2 git svn rebase }}}