bug#51555: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Hi Leo,

Leo Famulari  writes:

> On Thu, Nov 04, 2021 at 08:57:18AM -0400, Mark H Weaver wrote:
>> Although the WebKitGTK package itself built successfully using GCC 11,
>> the switch to GCC 11 caused many failures in programs that use
>> WebKitGTK.  For example:
>
> Should we just revert the WebKitGTK upgrade for now?

I'm reluctant to do that, because it would mean reintroducing
CVE-2021-30846, CVE-2021-30851 and CVE-2021-42762.  According to
, two of those
CVEs could allow an attacker to execute arbitrary code via maliciously
crafted web content.

For now, I've reverted back to using clang-11 to compile WebKitGTK,
which works correctly on x86_64-linux, but another fix will be needed to
i686-linux users.  I have some ideas on how to fix it.  I'll write about
that soon at 51...@debbugs.gnu.org.

  Regards,
Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51559: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

Am Donnerstag, den 04.11.2021, 11:47 -0400 schrieb Leo Famulari:
> On Thu, Nov 04, 2021 at 08:57:18AM -0400, Mark H Weaver wrote:
> > Although the WebKitGTK package itself built successfully using GCC
> > 11,
> > the switch to GCC 11 caused many failures in programs that use
> > WebKitGTK.  For example:
> 
> Should we just revert the WebKitGTK upgrade for now?
SGTM.  Can someone check whether it builds fine with GCC 10 on c-u-
frozen?

bug#51559: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Leo Famulari]

On Thu, Nov 04, 2021 at 08:57:18AM -0400, Mark H Weaver wrote:
> Although the WebKitGTK package itself built successfully using GCC 11,
> the switch to GCC 11 caused many failures in programs that use
> WebKitGTK.  For example:

Should we just revert the WebKitGTK upgrade for now?

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

reopen 51591
thanks

Hi Liliana,

Mark H Weaver  writes:

> Liliana Marie Prikler  writes:
>
>> Am Mittwoch, den 03.11.2021, 14:09 -0400 schrieb Mark H Weaver:
>>> [...]
>>> 
>>> Note that I tried clang-11 first, because upstream WebKit surely uses
>>> clang for compilation, and it works for building IceCat on Guix, so I
>>> had it hunch that it was a good bet.  However, it would be good to
>>> now try compiling webkitgtk-2.34.1 with a newer version of GCC.  It's
>>> possible that might fix the build on i686-linux.
>> I'm currently building webkitgtk on x86_64 locally with GCC 11.  If
>> that succeeds, I'll push to master and have CI take it from there.
>
> For the record, it's commit 63f78f6a6ea0d33f3b1fa68c7285cfb865677211 on
> the 'master' branch, and it did indeed fix the build on i686-linux.

I spoke too soon.

Although the WebKitGTK package itself built successfully using GCC 11,
the switch to GCC 11 caused many failures in programs that use
WebKitGTK.  For example:

  https://ci.guix.gnu.org/build/1530462/details (epiphany)
  https://ci.guix.gnu.org/build/1530484/details (gnome-online-accounts)
  https://ci.guix.gnu.org/build/1530479/details (yelp)
  https://ci.guix.gnu.org/build/1530407/details (surf)
  https://ci.guix.gnu.org/build/1530465/details (zenity)

See below for an illustrative excerpt from the failed epiphany log.

I've pushed commit 1007eb4874b7d3d2e0ecda07157f5794a0591ea2 to 'master',
which reverts commit 63f78f6a6e.

I've also reopened , to track progress on
fixing the webkitgtk build on i686 using clang-11.  I have a couple of
ideas of how to fix it.  To be continued...

   Mark

--8<---cut here---start->8---
[274/292] Linking target src/epiphany.
FAILED: src/epiphany 
gcc  -o src/epiphany 
'src/25a6634@@epiphany@exe/meson-generated_.._epiphany-resources.c.o' 
'src/25a6634@@epiphany@exe/meson-generated_.._ephy-type-builtins.c.o' 
'src/25a6634@@epiphany@exe/meson-generated_.._.._embed_ephy-embed-type-builtins.c.o'
 
'src/25a6634@@epiphany@exe/meson-generated_.._.._lib_ephy-lib-type-builtins.c.o'
 
'src/25a6634@@epiphany@exe/meson-generated_.._.._lib_widgets_ephy-widgets-type-builtins.c.o'
 'src/25a6634@@epiphany@exe/ephy-main.c.o' -Wl,--as-needed -Wl,--no-undefined 
-Wl,-rpath=/gnu/store/qaia05dz19yc8p1lmf6jnrlmlwzw45iv-epiphany-3.34.4/lib/epiphany
 -Wl,--start-group src/libephymain.so embed/libephyembed.a lib/libephymisc.so 
subprojects/libhandy/src/libhandy-0.0.a lib/sync/libephysync.so 
lib/widgets/libephywidgets.a 
/gnu/store/arza64g68736x20dmh786d3vrlnp5zq2-libdazzle-3.37.1/lib/libdazzle-1.0.so
 /gnu/store/rcjh2gisni3jzkld0d7883kzsmmj0kwg-gtk+-3.24.24/lib/libgtk-3.so 
/gnu/store/rcjh2gisni3jzkld0d7883kzsmmj0kwg-gtk+-3.24.24/lib/libgdk-3.so 
/gnu/store/66crnfykciiip52fjlawxd4aa62yx7kc-pango-1.44.7/lib/libpangocairo-1.0.so
 /gnu/store/66crnfykciiip52fjlawxd4aa62yx7kc-pango-1.44.7/lib/libpango-1.0.so 
/gnu/store/7n014z63svmbih0wbq15hanilmjnzl41-harfbuzz-2.6.4/lib/libharfbuzz.so 
/gnu/store/hd946pyi5lwqa980fzglqb8299k9518w-atk-2.34.1/lib/libatk-1.0.so 
/gnu/store/kakspf0hkf7pnyq581bh0pq3r3bjfrvx-cairo-1.16.0/lib/libcairo-gobject.so
 /gnu/store/kakspf0hkf7pnyq581bh0pq3r3bjfrvx-cairo-1.16.0/lib/libcairo.so 
/gnu/store/gj6q6rs9aprwkk4x67y8nv45hai5fq2v-gdk-pixbuf+svg-2.40.0/lib/libgdk_pixbuf-2.0.so
 /gnu/store/qzj0j8lv58fyr7dbsjj4fzjcqvgmkwzb-glib-2.62.6/lib/libgio-2.0.so 
/gnu/store/qzj0j8lv58fyr7dbsjj4fzjcqvgmkwzb-glib-2.62.6/lib/libgobject-2.0.so 
/gnu/store/qzj0j8lv58fyr7dbsjj4fzjcqvgmkwzb-glib-2.62.6/lib/libglib-2.0.so 
/gnu/store/3jqq5m8j8vbawm8bgirhwrsywpdmgmnv-json-glib-1.4.4/lib/libjson-glib-1.0.so
 
/gnu/store/338yvdb6jr0nnscbb30zfa6xm1sdf0mr-libsecret-0.20.4/lib/libsecret-1.so 
/gnu/store/b5lfjmd8wgdvc9050870xianfz7isvna-libsoup-2.72.0/lib/libsoup-2.4.so 
/gnu/store/c8w9z48vvx2a3q3k44ch9yn00wk1qwhb-libxml2-2.9.10/lib/libxml2.so -lm 
/gnu/store/807c6g9xqrxdjyhm8wm1r6jjjmc8q4vs-sqlite-3.31.1/lib/libsqlite3.so 
/gnu/store/4436r43crxcdmz011r7i2c1niz4jvi6g-webkitgtk-2.34.1/lib/libwebkit2gtk-4.0.so
 
/gnu/store/4436r43crxcdmz011r7i2c1niz4jvi6g-webkitgtk-2.34.1/lib/libjavascriptcoregtk-4.0.so
 -Wl,--export-dynamic 
/gnu/store/qzj0j8lv58fyr7dbsjj4fzjcqvgmkwzb-glib-2.62.6/lib/libgmodule-2.0.so 
-pthread -lrt -lgmp 
/gnu/store/mz5fvdfks10rmwxf29n95bp9bim6wq7g-nettle-3.5.1/lib/libhogweed.so 
/gnu/store/mz5fvdfks10rmwxf29n95bp9bim6wq7g-nettle-3.5.1/lib/libnettle.so 
/gnu/store/j0d13s4j72nvmzdg7v0k529qyas7x2wk-gcr-3.34.0/lib/libgcr-ui-3.so 
/gnu/store/j0d13s4j72nvmzdg7v0k529qyas7x2wk-gcr-3.34.0/lib/libgcr-base-3.so 
/gnu/store/j0d13s4j72nvmzdg7v0k529qyas7x2wk-gcr-3.34.0/lib/libgck-1.so 
/gnu/store/p0p3p28cc5n220cikqvq1r6xgf7qx066-p11-kit-0.23.22/lib/libp11-kit.so 
/gnu/store/li61ai11bbayiqsz0ab4wawxifdd5wza-libnotify-0.7.9/lib/libnotify.so 
-Wl,--end-group 
'-Wl,-rpath,$ORIGIN/:$ORIGIN/../embed:$ORIGIN/../lib:$ORIGIN/../subprojects/libhandy/src:$ORIGIN/../lib/sync:$ORIGIN/../lib/widgets'
 

bug#51559: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Hi Liliana,

Liliana Marie Prikler  writes:

> Am Mittwoch, den 03.11.2021, 14:09 -0400 schrieb Mark H Weaver:
>> [...]
>> 
>> Note that I tried clang-11 first, because upstream WebKit surely uses
>> clang for compilation, and it works for building IceCat on Guix, so I
>> had it hunch that it was a good bet.  However, it would be good to
>> now try compiling webkitgtk-2.34.1 with a newer version of GCC.  It's
>> possible that might fix the build on i686-linux.
> I'm currently building webkitgtk on x86_64 locally with GCC 11.  If
> that succeeds, I'll push to master and have CI take it from there.

For the record, it's commit 63f78f6a6ea0d33f3b1fa68c7285cfb865677211 on
the 'master' branch, and it did indeed fix the build on i686-linux.

Thanks again,
Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51555: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Liliana Marie Prikler  writes:

> Am Mittwoch, den 03.11.2021, 14:09 -0400 schrieb Mark H Weaver:
>> [...]
>> 
>> Note that I tried clang-11 first, because upstream WebKit surely uses
>> clang for compilation, and it works for building IceCat on Guix, so I
>> had it hunch that it was a good bet.  However, it would be good to
>> now try compiling webkitgtk-2.34.1 with a newer version of GCC.  It's
>> possible that might fix the build on i686-linux.
> I'm currently building webkitgtk on x86_64 locally with GCC 11.  If
> that succeeds, I'll push to master and have CI take it from there.

Sounds good.  Thank you, Liliana!

 Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51555: bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

Am Mittwoch, den 03.11.2021, 14:09 -0400 schrieb Mark H Weaver:
> [...]
> 
> Note that I tried clang-11 first, because upstream WebKit surely uses
> clang for compilation, and it works for building IceCat on Guix, so I
> had it hunch that it was a good bet.  However, it would be good to
> now try compiling webkitgtk-2.34.1 with a newer version of GCC.  It's
> possible that might fix the build on i686-linux.
I'm currently building webkitgtk on x86_64 locally with GCC 11.  If
that succeeds, I'll push to master and have CI take it from there.

Cheers,
Liliana

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

FYI, I pushed commit 9d3a5ddc2700aa099bb1bf9c5e8b3062445b907a to
'master', which fixes the webkitgtk-2.34.1 build on x86_64-linux.  In
addition to the fixes already shown in Liliana's proposed patch,
9d3a5ddc27 also arranges to use clang-11 for compilation.

Unfortunately, the build fails on i686-linux, which is the only system
other than x86_64-linux where webkitgtk-2.32.4 was successfully built.

Note that I tried clang-11 first, because upstream WebKit surely uses
clang for compilation, and it works for building IceCat on Guix, so I
had it hunch that it was a good bet.  However, it would be good to now
try compiling webkitgtk-2.34.1 with a newer version of GCC.  It's
possible that might fix the build on i686-linux.

Anyway, I'm closing this bug.  I'll open another bug to track the
i686-linux issue.

 Thanks,
   Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

Am Mittwoch, den 03.11.2021, 03:16 -0400 schrieb Mark H Weaver:
> In the case, upstream's upstream (WebKit) is Apple, which I guess
> uses some version of clang for compilation.  I'm currently trying to
> build WebKitGTK with clang-11, and so far it looks hopeful.  It has
> gotten beyond the point where it failed before, anyway.
I don't think we want to use Clang for WebKit, even if Apple does. 
Either way...

> I do not yet know whether it will ultimately succeed, but I went
> ahead and pushed my preliminary patch to the 'gnuzilla-updates'
> branch. (Admittedly, it's a slight abuse of that branch, but this was
> the most expedient way for me to ask the Berlin build farm to try
> building WebKitGTK and its dependents on the 'master' branch.)
> 
> If it turns out to work, feel free to push the commit to 'master' on
> my behalf (with the "UNTESTED: " prefix removed from the log, of
> course).
It builds for x86_64, but fails for i686.  I haven't checked the other
systems, perhaps they finished during my commute, but I'm pretty sure
that means no webkit for a large amount of users.

Regards,
Liliana

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Hi Liliana,

Liliana Marie Prikler  writes:

> Am Dienstag, den 02.11.2021, 13:31 -0400 schrieb Mark H Weaver:
[...]
>> or (2) try using a newer C++ compiler.
> Is this really an issue with g++?

Not necessarily.  It could be that the code relies on compiler behavior
beyond what is required by the C++ standard.

> What does upstream use for compilation?

In the case, upstream's upstream (WebKit) is Apple, which I guess uses
some version of clang for compilation.  I'm currently trying to build
WebKitGTK with clang-11, and so far it looks hopeful.  It has gotten
beyond the point where it failed before, anyway.

I do not yet know whether it will ultimately succeed, but I went ahead
and pushed my preliminary patch to the 'gnuzilla-updates' branch.
(Admittedly, it's a slight abuse of that branch, but this was the most
expedient way for me to ask the Berlin build farm to try building
WebKitGTK and its dependents on the 'master' branch.)

If it turns out to work, feel free to push the commit to 'master' on my
behalf (with the "UNTESTED: " prefix removed from the log, of course).

 Regards,
   Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

Am Dienstag, den 02.11.2021, 13:31 -0400 schrieb Mark H Weaver:
> Hi Liliana,
> 
> Liliana Marie Prikler  writes:
> > I'm now trying 2.34.4 (same version and hash as c-u-f), which at
> > least appears to build further than the bug we both encounter.
> 
> As far as I can tell, WebKitGTK 2.34.4 doesn't yet exist.  The newest
> version available at ;, and the
> only release version that has fixed the announced security flaws, is
> 2.34.1, which is the one that we're failing to build successfully
> with GCC 7.5.
> 
> The version of WebKitGTK that I see on 'core-updates-frozen' is not
> 2.34.4, but rather 2.32.4, which is the version we had on 'master'
> before the (apparently untested) security update commit 8797a07ac0.
> 
> Unfortunately that version is vulnerable to CVE-2021-30846,
> CVE-2021-30851, and CVE-2021-42762, according to
> ;,
> 
> Am I missing something?
You're missing how I wasted hours of my life because I misread a
version field... *sigh*

> I don't have time to work on this today, but I have two suggestions:
> (1) look in the upstream git repo for updates that might fix this
> issue,
> or (2) try using a newer C++ compiler.
Is this really an issue with g++?  What does upstream use for
compilation?  (I'd rather refrain from manually trying 8, 9, 10 in
succession)

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Hi Liliana,

Liliana Marie Prikler  writes:
> I'm now trying 2.34.4 (same version and hash as c-u-f), which at least
> appears to build further than the bug we both encounter.

As far as I can tell, WebKitGTK 2.34.4 doesn't yet exist.  The newest
version available at , and the only
release version that has fixed the announced security flaws, is 2.34.1,
which is the one that we're failing to build successfully with GCC 7.5.

The version of WebKitGTK that I see on 'core-updates-frozen' is not
2.34.4, but rather 2.32.4, which is the version we had on 'master'
before the (apparently untested) security update commit 8797a07ac0.

Unfortunately that version is vulnerable to CVE-2021-30846,
CVE-2021-30851, and CVE-2021-42762, according to
,

Am I missing something?

I don't have time to work on this today, but I have two suggestions:
(1) look in the upstream git repo for updates that might fix this issue,
or (2) try using a newer C++ compiler.

Anyway, thanks very much for looking into it.

  Regards,
Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

"Leo Famulari"  writes:
> Thanks, please push!

How about testing it first, for a change?  An essentially equivalent[*]
patch didn't work for me, although admittedly my private branch has
diverged quite a bit from master.  Based on the error message, I guess
we might need to use a newer C++ compiler.

   Mark


[*] The only difference between Liliana's patch and the one I tested was
where "-DUSE_SOUP2=ON" was inserted in the configure flags.

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about .

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

Am Dienstag, den 02.11.2021, 12:08 -0400 schrieb Mark H Weaver:
> "Leo Famulari"  writes:
> > Thanks, please push!
> 
> How about testing it first, for a change?  An essentially
> equivalent[*] patch didn't work for me, although admittedly my
> private branch has diverged quite a bit from master.  Based on the
> error message, I guess we might need to use a newer C++ compiler.
An exactly equivalent patch didn't work for me with just a single patch
diverging from master (that being Wine 6.20), though with possibly some
backlog in `guix pull', as it takes hours to build this.

I'm now trying 2.34.4 (same version and hash as c-u-f), which at least
appears to build further than the bug we both encounter.

Cheers!

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Leo Famulari]

Thanks, please push!

On Tue, Nov 2, 2021, at 06:04, Liliana Marie Prikler wrote:
> See , , and
> .
>
> * gnu/packages/webkit.scm (webkitgtk)[#:configure-flags]: Enable USE_SOUP2.
> [inputs]: Add lcms.
> ---
> Currently building this thing, but my machine is rather slow.
> Someone with a faster one might want to try and push it in my stead.
>
>  gnu/packages/webkit.scm | 4 
>  1 file changed, 4 insertions(+)
>
> diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
> index 0e6cdb8588..8600c3833e 100644
> --- a/gnu/packages/webkit.scm
> +++ b/gnu/packages/webkit.scm
> @@ -40,6 +40,7 @@ (define-module (gnu packages webkit)
>#:use-module (gnu packages freedesktop)
>#:use-module (gnu packages gcc)
>#:use-module (gnu packages gettext)
> +  #:use-module (gnu packages ghostscript)
>#:use-module (gnu packages gl)
>#:use-module (gnu packages glib)
>#:use-module (gnu packages gnome)
> @@ -248,6 +249,8 @@ (define-public webkitgtk
>;; TODO Decide if we should enable this
>"-DENABLE_GAMEPAD=OFF"
>"-DUSE_SYSTEMD=OFF"
> +  ;; XXX: Remove once we have libsoup 3
> +  "-DUSE_SOUP2=ON"
>(string-append ; uses lib64 by default
> "-DLIB_INSTALL_DIR="
> (assoc-ref %outputs "out") "/lib")
> @@ -336,6 +339,7 @@ (define-public webkitgtk
> ("libxml2" ,libxml2)
> ("libxslt" ,libxslt)
> ("libxt" ,libxt)
> +   ("lcms" ,lcms)
> ("mesa" ,mesa)
> ("openjpeg" ,openjpeg)
> ("sqlite" ,sqlite)
> -- 
> 2.33.1

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Mark H Weaver]

Hi Liliana,

Liliana Marie Prikler  writes:

> See , , and
> .
>
> * gnu/packages/webkit.scm (webkitgtk)[#:configure-flags]: Enable USE_SOUP2.
> [inputs]: Add lcms.
> ---
> Currently building this thing, but my machine is rather slow.
> Someone with a faster one might want to try and push it in my stead.

Thanks.  I tried essentially the same patch on my private branch, modulo
the ordering of #:configure-flags, but it failed after compiling for
several hours.  Here's the tail of the build log:

--8<---cut here---start->8---
[ 49%] Building CXX object 
Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-4babe430-1.cpp.o
cd /tmp/guix-build-webkitgtk-2.34.1.drv-0/build/Source/WebCore && 
/gnu/store/rn75fm7adgx3pw5j8pg3bczfqq1y17lk-gcc-7.5.0/bin/c++  
-DBUILDING_GTK__=1 -DBUILDING_WEBKIT -DBUILDING_WITH_CMAKE=1 -DBUILDING_WebCore 
-DBWRAP_EXECUTABLE=\"/gnu/store/jsw78nn91z34z2cm227zwjhpybx2p2lw-bubblewrap-0.4.1/bin/bwrap\"
 
-DDBUS_PROXY_EXECUTABLE=\"/gnu/store/97mk98nb7s2z563xbva7p2i8m1ll6hpz-xdg-dbus-proxy-0.1.2/bin/xdg-dbus-proxy\"
 -DGETTEXT_PACKAGE=\"WebKit2GTK-4.0\" -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED 
-DSTATICALLY_LINKED_WITH_PAL -DSTATICALLY_LINKED_WITH_WTF 
-DSTATICALLY_LINKED_WITH_bmalloc -DWEBKITGTK_API_VERSION_STRING=\"4.0\" 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/platform/graphics/libwpe
 -I/tmp/guix-build-webkitgtk-2.34.1.drv-0/build 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/build/WebCore/DerivedSources 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/airplay
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/applepay
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/applepay/paymentrequest
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/applicationmanifest
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/async-clipboard
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/beacon
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/cache
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/contact-picker
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/credentialmanagement
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/encryptedmedia
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/encryptedmedia/legacy
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/entriesapi
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/fetch
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/geolocation
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/highlight
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/indexeddb
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/indexeddb/client
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/indexeddb/server
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/indexeddb/shared
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediacapabilities
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediacontrols
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediarecorder
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediasession
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediasource
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediastream
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/mediastream/libwebrtc
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/model-element
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/navigatorcontentutils
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/notifications
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/paymentrequest
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/permissions
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/pictureinpicture
 
-I/tmp/guix-build-webkitgtk-2.34.1.drv-0/webkitgtk-2.34.1/Source/WebCore/Modules/plugins
 

bug#51564: [PATCH] gnu: webkitgtk: Fix configure failures.

[Liliana Marie Prikler]

See , , and
.

* gnu/packages/webkit.scm (webkitgtk)[#:configure-flags]: Enable USE_SOUP2.
[inputs]: Add lcms.
---
Currently building this thing, but my machine is rather slow.
Someone with a faster one might want to try and push it in my stead.

 gnu/packages/webkit.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0e6cdb8588..8600c3833e 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -40,6 +40,7 @@ (define-module (gnu packages webkit)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -248,6 +249,8 @@ (define-public webkitgtk
   ;; TODO Decide if we should enable this
   "-DENABLE_GAMEPAD=OFF"
   "-DUSE_SYSTEMD=OFF"
+  ;; XXX: Remove once we have libsoup 3
+  "-DUSE_SOUP2=ON"
   (string-append ; uses lib64 by default
"-DLIB_INSTALL_DIR="
(assoc-ref %outputs "out") "/lib")
@@ -336,6 +339,7 @@ (define-public webkitgtk
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libxt" ,libxt)
+   ("lcms" ,lcms)
("mesa" ,mesa)
("openjpeg" ,openjpeg)
("sqlite" ,sqlite)
-- 
2.33.1