Bug 194744 – [GTK][STABLE] Update-webkitgtk-libs for Webkit GTK 2.22 can not be generated anymore

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Pablo Saavedra]

The following patches added in 236726 (https://trac.webkit.org/changeset/236726/webkit#file4) probably during the preparation of the release are not longer available in the 2.22 branch:

    <patch file="gst-plugins-good-0007-matroskademux-Allow-Matroska-headers-to-be-read-more.patch" strip="1" /> <!-- Merged as 9dc7859184d4b7ad1dd7e2b54704e994dbace329 (to be shipped in 1.14.4) -->
    <patch file="gst-plugins-good-0008-matroskademux-Refactor-track-parsing-out-from-adding.patch" strip="1" /> <!-- Merged as f279bc5336dda19741a5996a108da42dd3201366 (to be shipped in 1.14.4) -->
    <patch file="gst-plugins-good-0009-matroskademux-Parse-successive-Tracks-elements.patch" strip="1" /> <!-- Merged as 0e60076a390fd3ef53d350940b2c695ff7bbe008 (to be shipped in 1.14.4) -->



    $ ls /home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/
    gst-plugins-base-0001-parsebin-Post-STREAM_COLLECTION-on-EVENT_STREAM_COLL.patch  gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
    gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch  gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch
    gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch               gst-plugins-good-0010-matroskademux-Emit-no-more-pads-after-parsing-Tracks.patch
    gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch        openh264-configure.patch



These are missing in in webkit-2.22: https://trac.webkit.org/browser/webkit/releases/WebKitGTK/webkit-2.22/Tools/gstreamer?rev=236726#patches


This situation causes the fail in the `perl ./Tools/Scripts/update-webkitgtk-libs`. Trace (https://build-webkit.igalia.com/builders/GTK%20Linux%2064-bit%20Release%20Stable%20%282.22%29/builds/1/steps/jhbuild/logs/stdio): 

    xzcat -d "/home/buildbot/webkitgtk/jhbuild-mirror/gst-plugins-good-1.14.1.tar.xz" | tar xf -
    *** Applying patch gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch *** [29/47]
    patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-    preferred-protection.patch"
    patching file gst/isomp4/qtdemux.c
    patching file gst/isomp4/qtdemux.h
    *** Applying patch gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch *** [29/47]
    patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch"
    patching file gst/isomp4/qtdemux.c
    *** Applying patch gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch *** [29/47]
    patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch"
    patching file gst/isomp4/qtdemux.c
    Hunk #1 succeeded at 7854 (offset -202 lines).
    *** Applying patch gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch *** [29/47]
    patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch"
    patching file gst/isomp4/qtdemux.c
    Hunk #1 succeeded at 2518 (offset -82 lines).
    *** Applying patch gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch *** [29/47]
    patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch"
    patching file gst/isomp4/qtdemux.c
    Hunk #1 succeeded at 7857 (offset -239 lines).
    Hunk #2 succeeded at 7888 (offset -239 lines).
    Hunk #3 succeeded at 7913 (offset -239 lines).
    Failed to build GTK+ port dependencies with jhbuild


Those patches was removed in trunk (r236960: <https://trac.webkit.org/changeset/236960>):

  2018-10-09  Philippe Normand  <[e-mail]>

        [JHBuild] Update to GStreamer 1.14.4
        https://bugs.webkit.org/show_bug.cgi?id=190395

        Reviewed by Xabier Rodriguez-Calvar.

        * gstreamer/jhbuild.modules: Remove patches merged in 1.14.4 and bump version of GStreamer modules.
        * gstreamer/patches/gst-plugins-good-0007-matroskademux-Allow-Matroska-headers-to-be-read-more.patch: Removed.
        * gstreamer/patches/gst-plugins-good-0008-matroskademux-Refactor-track-parsing-out-from-adding.patch: Removed.
        * gstreamer/patches/gst-plugins-good-0009-matroskademux-Parse-successive-Tracks-elements.patch: Removed.
        * gstreamer/patches/gst-plugins-good-0010-matroskademux-Emit-no-more-pads-after-parsing-Tracks.patch: Removed.

[Pablo Saavedra]

Created attachment 362218 [details]
patch

[Michael Catanzaro]

Thanks.

[Michael Catanzaro]

Committed https://trac.webkit.org/changeset/241650/webkit