diff --git a/base/comps/webkitgtk/webkitgtk.comp.toml b/base/comps/webkitgtk/webkitgtk.comp.toml index fd3dc5f9dd5..27c35acbd3b 100644 --- a/base/comps/webkitgtk/webkitgtk.comp.toml +++ b/base/comps/webkitgtk/webkitgtk.comp.toml @@ -5,6 +5,14 @@ # gstreamer1-plugins-bad-free is not shipped in AZL. WebKitGTK only # soft-recommends it for optional codec support; removing the Recommends # prevents package managers from trying to pull in a non-existent package. +# The hard BuildRequires on pkgconfig(gstreamer-plugins-bad-1.0) in the +# Fedora spec is vestigial — under default cmake options the WebKitGTK +# 2.50 sources do not actually #include any gst-plugins-bad headers +# (gst-bad is only reached via GSTREAMER_MPEGTS / GSTREAMER_WEBRTC / +# LIBWEBRTC code paths, all of which default OFF for the GTK port). +# Removing just the BR is therefore sufficient to unblock the build +# without changing any runtime feature surface (MSE/EME stay at their +# upstream defaults). [components.webkitgtk] @@ -15,7 +23,13 @@ tag = "BuildRequires" value = "pkgconfig(libavif)" [[components.webkitgtk.overlays]] -description = "Disable avif support in WebKitGTK cmake builds" +description = "Remove gstreamer-plugins-bad-1.0 BuildRequires (gstreamer1-plugins-bad-free not shipped in AZL; vestigial in upstream spec, no gst-bad headers are #included under default cmake options)" +type = "spec-remove-tag" +tag = "BuildRequires" +value = "pkgconfig(gstreamer-plugins-bad-1.0)" + +[[components.webkitgtk.overlays]] +description = "Disable avif support in WebKitGTK cmake builds (libavif not available in AZL)" type = "spec-search-replace" section = "%build" regex = '%cmake \\' diff --git a/locks/webkitgtk.lock b/locks/webkitgtk.lock index 45b3a82c8c2..7d31bf74c2c 100644 --- a/locks/webkitgtk.lock +++ b/locks/webkitgtk.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d' upstream-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d' -input-fingerprint = 'sha256:be1846a272a139b429ffe3d470467a4400821eba81b3368a3609f552ebfdb971' +input-fingerprint = 'sha256:0e8ddb60325dc8f6b3ceda610c26a3502bebcb13ae691a10776c01eddc017f11' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/w/webkitgtk/webkitgtk.spec b/specs/w/webkitgtk/webkitgtk.spec index 0fdd17c7ba1..7dde64ee576 100644 --- a/specs/w/webkitgtk/webkitgtk.spec +++ b/specs/w/webkitgtk/webkitgtk.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 4; + release_number = 5; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -109,7 +109,6 @@ BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk4) @@ -470,6 +469,9 @@ export NINJA_STATUS="[2/2][%f/%t %es] " %changelog ## START: Generated by rpmautospec +* Sun May 24 2026 Chris Co - 2.50.5-5 +- fix(webkitgtk): drop vestigial gstreamer-plugins-bad BR + * Thu May 21 2026 Chris Co - 2.50.5-4 - fix(webkitgtk): remove Recommends on gstreamer1-plugins-bad-free