diff mbox series

[v1] package/wpewebkit: fix compile without video support

Message ID 20201110221629.7011-1-ps.report@gmx.net
State Accepted
Headers show
Series [v1] package/wpewebkit: fix compile without video support | expand

Commit Message

Peter Seiderer Nov. 10, 2020, 10:16 p.m. UTC 
Fixes:

  - https://bugs.busybox.net/show_bug.cgi?id=13306

      .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’?
                   page->settings().setGenericCueAPIEnabled(enabled);
                                    ^~~~~~~~~~~~~~~~~~~~~~~
                                    setBeaconAPIEnabled

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 ...tedBundle-fix-compile-without-video-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch

Comments

Peter Korsgaard Nov. 12, 2020, 9:20 p.m. UTC | #1 
>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:

 > Fixes:
 >   - https://bugs.busybox.net/show_bug.cgi?id=13306

 >       .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’?
 >  page-> settings().setGenericCueAPIEnabled(enabled);
 >                                     ^~~~~~~~~~~~~~~~~~~~~~~
 >                                     setBeaconAPIEnabled

 > Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Committed, thanks. Don't forget to submit the patch upstream.
Peter Seiderer Nov. 12, 2020, 9:37 p.m. UTC | #2 
Hello Peter,

On Thu, 12 Nov 2020 22:20:26 +0100, Peter Korsgaard <peter@korsgaard.com> wrote:

> >>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:  
> 
>  > Fixes:
>  >   - https://bugs.busybox.net/show_bug.cgi?id=13306  
> 
>  >       .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’?
>  >  page-> settings().setGenericCueAPIEnabled(enabled);
>  >                                     ^~~~~~~~~~~~~~~~~~~~~~~
>  >                                     setBeaconAPIEnabled  
> 
>  > Signed-off-by: Peter Seiderer <ps.report@gmx.net>  
> 
> Committed, thanks. Don't forget to submit the patch upstream.
> 

Patch seems upstream already superseded by [1] 'Remove remaining alternative
preference setting mechanisms from LayoutTests' (removing the code)...

Regards,
Peter


[1] https://trac.webkit.org/changeset?reponame=webkit&new=269236%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp&old=269111%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp
Adrian Perez de Castro Nov. 13, 2020, 9:50 p.m. UTC | #3 
Hello there!

On Thu, 12 Nov 2020 22:37:34 +0100 Peter Seiderer <ps.report@gmx.net> wrote:
> Hello Peter,
> 
> On Thu, 12 Nov 2020 22:20:26 +0100, Peter Korsgaard <peter@korsgaard.com> wrote:
> 
> > >>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:  
> > 
> >  > Fixes:
> >  >   - https://bugs.busybox.net/show_bug.cgi?id=13306  
> > 
> >  >       .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’?
> >  >  page-> settings().setGenericCueAPIEnabled(enabled);
> >  >                                     ^~~~~~~~~~~~~~~~~~~~~~~
> >  >                                     setBeaconAPIEnabled  
> > 
> >  > Signed-off-by: Peter Seiderer <ps.report@gmx.net>  
> > 
> > Committed, thanks. Don't forget to submit the patch upstream.
> > 
> 
> Patch seems upstream already superseded by [1] 'Remove remaining alternative
> preference setting mechanisms from LayoutTests' (removing the code)...

I looked a bit into backporting this patch (and a few dependent ones) into the
stable release branch and it got complicated quickly. I think that it may be
better to have the fix that just uses the ENABLE(VIDEO) guards merged in the
release branch.

I have just created an issue in WebKit's Bugzilla:

  https://bugs.webkit.org/show_bug.cgi?id=218921

and I will have a fix done which will be included in version 2.30.3, which
is to be released soon and will also include security fixes. Maybe we would
prefer to wait until that version is released and update Buildroot to it
before ending the release candidate period. WDYT?

—Adrián

> [1] https://trac.webkit.org/changeset?reponame=webkit&new=269236%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp&old=269111%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp
Peter Korsgaard Nov. 14, 2020, 8:09 a.m. UTC | #4 
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

Hi,

 >> Patch seems upstream already superseded by [1] 'Remove remaining alternative
 >> preference setting mechanisms from LayoutTests' (removing the code)...

 > I looked a bit into backporting this patch (and a few dependent ones) into the
 > stable release branch and it got complicated quickly. I think that it may be
 > better to have the fix that just uses the ENABLE(VIDEO) guards merged in the
 > release branch.

 > I have just created an issue in WebKit's Bugzilla:

 >   https://bugs.webkit.org/show_bug.cgi?id=218921

Thanks!

 > and I will have a fix done which will be included in version 2.30.3, which
 > is to be released soon and will also include security fixes. Maybe we would
 > prefer to wait until that version is released and update Buildroot to it
 > before ending the release candidate period. WDYT?

I normally only cut the final release at the very end of the month /
early December, so if "soon" is before that, it should be fine.
Adrian Perez de Castro Nov. 14, 2020, 2:27 p.m. UTC | #5 
Hi Peter,

On Sat, 14 Nov 2020 09:09:04 +0100 Peter Korsgaard <peter@korsgaard.com> wrote:
> >>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:
> 
> Hi,
> 
>  >> Patch seems upstream already superseded by [1] 'Remove remaining alternative
>  >> preference setting mechanisms from LayoutTests' (removing the code)...
> 
>  > I looked a bit into backporting this patch (and a few dependent ones) into the
>  > stable release branch and it got complicated quickly. I think that it may be
>  > better to have the fix that just uses the ENABLE(VIDEO) guards merged in the
>  > release branch.
> 
>  > I have just created an issue in WebKit's Bugzilla:
> 
>  >   https://bugs.webkit.org/show_bug.cgi?id=218921
> 
> Thanks!
> 
>  > and I will have a fix done which will be included in version 2.30.3, which
>  > is to be released soon and will also include security fixes. Maybe we would
>  > prefer to wait until that version is released and update Buildroot to it
>  > before ending the release candidate period. WDYT?
> 
> I normally only cut the final release at the very end of the month /
> early December, so if "soon" is before that, it should be fine.

The person in charge of the WebKitGTK releases and myself (for WPE WebKit)
have been talking about when to make the new releases happen, and it's likely
that we will put out the tarballs and an accompanying WSA by Friday 20th.
If, for some reason, that cannot happen in the end, I will add submit this
patch to be included in the Buildroot release instead of the version bump.

Cheers,
—Adrián
Adrian Perez de Castro Nov. 16, 2020, 11:19 a.m. UTC | #6 
On Sat, 14 Nov 2020 16:27:30 +0200 Adrian Perez de Castro <aperez@igalia.com> wrote:
> Hi Peter,
> 
> On Sat, 14 Nov 2020 09:09:04 +0100 Peter Korsgaard <peter@korsgaard.com> wrote:
> > >>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:
> > 
> > Hi,
> > 
> >  >> Patch seems upstream already superseded by [1] 'Remove remaining alternative
> >  >> preference setting mechanisms from LayoutTests' (removing the code)...
> > 
> >  > I looked a bit into backporting this patch (and a few dependent ones) into the
> >  > stable release branch and it got complicated quickly. I think that it may be
> >  > better to have the fix that just uses the ENABLE(VIDEO) guards merged in the
> >  > release branch.
> > 
> >  > I have just created an issue in WebKit's Bugzilla:
> > 
> >  >   https://bugs.webkit.org/show_bug.cgi?id=218921

The patch is now in the 2.30 release branch \o/

> > Thanks!
> > 
> >  > and I will have a fix done which will be included in version 2.30.3, which
> >  > is to be released soon and will also include security fixes. Maybe we would
> >  > prefer to wait until that version is released and update Buildroot to it
> >  > before ending the release candidate period. WDYT?
> > 
> > I normally only cut the final release at the very end of the month /
> > early December, so if "soon" is before that, it should be fine.
> 
> The person in charge of the WebKitGTK releases and myself (for WPE WebKit)
> have been talking about when to make the new releases happen, and it's likely
> that we will put out the tarballs and an accompanying WSA by Friday 20th.
> If, for some reason, that cannot happen in the end, I will add submit this
> patch to be included in the Buildroot release instead of the version bump.

Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end
of this week. I'll submit patches to update the Buildroot packages as soon as
the releases are out.

Cheers,
—Adrián
Peter Korsgaard Nov. 16, 2020, 12:04 p.m. UTC | #7 
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

Hi,

 >> The person in charge of the WebKitGTK releases and myself (for WPE WebKit)
 >> have been talking about when to make the new releases happen, and it's likely
 >> that we will put out the tarballs and an accompanying WSA by Friday 20th.
 >> If, for some reason, that cannot happen in the end, I will add submit this
 >> patch to be included in the Buildroot release instead of the version bump.

 > Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end
 > of this week. I'll submit patches to update the Buildroot packages as soon as
 > the releases are out.

Great, thanks!
Adrian Perez de Castro Nov. 20, 2020, 4:22 p.m. UTC | #8 
On Mon, 16 Nov 2020 13:04:09 +0100 Peter Korsgaard <peter@korsgaard.com> wrote:
> >>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:
> 
> Hi,
> 
>  >> The person in charge of the WebKitGTK releases and myself (for WPE WebKit)
>  >> have been talking about when to make the new releases happen, and it's likely
>  >> that we will put out the tarballs and an accompanying WSA by Friday 20th.
>  >> If, for some reason, that cannot happen in the end, I will add submit this
>  >> patch to be included in the Buildroot release instead of the version bump.
> 
>  > Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end
>  > of this week. I'll submit patches to update the Buildroot packages as soon as
>  > the releases are out.
> 
> Great, thanks!

Done, here's the patches to update both WebKitGTK and WPE WebKit to 2.30.3:

  https://patchwork.ozlabs.org/project/buildroot/patch/20201120161937.222193-1-aperez@igalia.com/
  https://patchwork.ozlabs.org/project/buildroot/patch/20201120161918.222066-1-aperez@igalia.com/

There will be a security advisory covering these releases, but it is still
going to take a day or two to have it online.

Cheers,
—Adrián
diff mbox series

Patch

diff --git a/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch b/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch
new file mode 100644
index 0000000000..e684c4e3e7
--- /dev/null
+++ b/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch
@@ -0,0 +1,42 @@ 
+From 1ca7dea56db25969844699bc82fe7c78cb3d2eda Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 10 Nov 2020 23:06:45 +0100
+Subject: [PATCH] WebProcess/InjectedBundle: fix compile without video support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+  .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’?
+               page->settings().setGenericCueAPIEnabled(enabled);
+                                ^~~~~~~~~~~~~~~~~~~~~~~
+                                setBeaconAPIEnabled
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
+index 61326f2e..d7776997 100644
+--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
+@@ -236,12 +236,14 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
+         RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled);
+ #endif
+ 
++#if ENABLE(VIDEO)
+     if (preference == "WebKitGenericCueAPIEnabled") {
+         WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::genericCueAPIEnabledKey(), enabled);
+         for (auto* page : pages)
+             page->settings().setGenericCueAPIEnabled(enabled);
+         return;
+     }
++#endif
+ 
+ #if ENABLE(GPU_PROCESS)
+     if (preference == "WebKitUseGPUProcessForMedia" || preference == "WebKitCaptureAudioInGPUProcessEnabledKey") {
+-- 
+2.29.2
+