webkitgtk: 2.18 -> 2.20 #37050

bendlas · 2018-03-15T01:21:21Z

see https://webkitgtk.org/2018/03/12/webkitgtk2.20.0-released.html
cc @hamishmack @groxxda

Things done

Update: as of second patch, build on nixos succeeds

~~The build fails with~~

...
[ 79%] Generating ../../DerivedSources/WebKit/WebInspectorUIMessageReceiver.cpp, ../../DerivedSources/WebKit/WebInspectorUIMessages.h
[ 79%] Generating ../../DerivedSources/WebKit/LegacyCustomProtocolManagerMessageReceiver.cpp, ../../DerivedSources/WebKit/LegacyCustomProtocolManagerMessages.h
[ 79%] Generating ../../DerivedSources/WebKit/StorageAreaMapMessageReceiver.cpp, ../../DerivedSources/WebKit/StorageAreaMapMessages.h
[ 79%] Generating ../../DerivedSources/WebKit/LegacyCustomProtocolManagerProxyMessageReceiver.cpp, ../../DerivedSources/WebKit/LegacyCustomProtocolManagerProxyMessages.h
[ 79%] Generating ../../inspector-resources.stamp
No such file or directory
make[2]: *** [Source/WebKit/CMakeFiles/WebKit.dir/build.make:2191: inspector-resources.stamp] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:1239: Source/WebKit/CMakeFiles/WebKit.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 79%] Linking CXX static library ../../lib/libWebCoreTestSupport.a
[ 79%] Built target WebCoreTestSupport
make: *** [Makefile:152: all] Error 2
builder for '/nix/store/0303qc28jl5h5bv9rbxjhp4ir54bvil3-webkitgtk-2.20.0.drv' failed with exit code 2
error: build of '/nix/store/0303qc28jl5h5bv9rbxjhp4ir54bvil3-webkitgtk-2.20.0.drv' failed: builder for '/nix/store/0303qc28jl5h5bv9rbxjhp4ir54bvil3-webkitgtk-2.20.0.drv' failed with exit code 2
error: build of '/nix/store/0303qc28jl5h5bv9rbxjhp4ir54bvil3-webkitgtk-2.20.0.drv' failed

Darwin support:

None of the Darwin patches apply any more, and since I don't own a Mac
to test new ones, I deleted them from the build. Please re-add as
necessary.
The patch expression also likely needs updating.

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

jtojnar · 2018-03-15T01:28:04Z

Can this be the issue https://bugs.webkit.org/show_bug.cgi?id=181040? I would like to merge this to #36893.

bendlas · 2018-03-15T02:00:53Z

Awesome find. It seems that patch has already landed, however, when sneaking a patchShebangs . into postPatch, it found two more cases of /bin/bash, in something called generate-parser.sh. Running the build now ...

bendlas · 2018-03-15T02:08:26Z

Great Success! The error generating inspector-resources.stamp was fixed. Let's see, if the build comes through ...

this eliminates a build error due to /bin/bash in build scripts

bendlas · 2018-03-15T02:24:09Z

It worked. Binaries seem to run.
Since there don't seem to be any critical security fixes, I'll leave this till the weekend to see if somebody wants to take care of darwin support. If nobody shows up, I'll re-add the 2.18 file for Darwin.

jtojnar · 2018-03-15T12:41:29Z

For some reason, it does not build for me without libgcrypt on unstable.

bendlas · 2018-03-15T13:29:29Z

For some reason, it does not build for me without libgcrypt on unstable.

On NixOS? How does this manifest? Does it suffice to add to build inputs?

jtojnar · 2018-03-15T13:37:02Z

Yes. The following error:

CMake Error at /nix/store/9bhialxbn35a1vlgjbvn6nwjgs54cl19-cmake-3.10.2/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find LibGcrypt (missing: LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR)
  (Required is at least version "1.6.0")
Call Stack (most recent call first):
  /nix/store/9bhialxbn35a1vlgjbvn6nwjgs54cl19-cmake-3.10.2/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
  Source/cmake/FindLibGcrypt.cmake:74 (find_package_handle_standard_args)
  Source/cmake/OptionsGTK.cmake:25 (find_package)
  Source/cmake/WebKitCommon.cmake:61 (include)
  CMakeLists.txt:152 (include)


-- Configuring incomplete, errors occurred!

Yes, it is enough.

hedning · 2018-03-17T00:44:44Z

I'm unable to build this (this exact commit, and on top of master). The error:

[ 25%] Building CXX object Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/llint/LLIntOffsetsExtractor.cpp.o
In file included from /build/webkitgtk-2.20.0/Source/JavaScriptCore/heap/HeapFinalizerCallback.h:28:0,
                 from /build/webkitgtk-2.20.0/Source/JavaScriptCore/heap/Heap.h:33,
                 from /build/webkitgtk-2.20.0/Source/JavaScriptCore/heap/DeferGC.h:29,
                 from /build/webkitgtk-2.20.0/Source/JavaScriptCore/runtime/ConcurrentJSLock.h:28,
                 from /build/webkitgtk-2.20.0/Source/JavaScriptCore/bytecode/ArrayProfile.h:28,
                 from /build/webkitgtk-2.20.0/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp:28:
/build/webkitgtk-2.20.0/Source/JavaScriptCore/API/JSHeapFinalizerPrivate.h:29:41: fatal error: JavaScriptCore/JSContextRef.h: No such file or directory
 #include <JavaScriptCore/JSContextRef.h>
                                         ^

Full log from hydra: https://nix-cache.s3.amazonaws.com/log/xfy72vycyzrb0rg39s32gq92dmdbkprv-webkitgtk-2.20.0.drv

hedning · 2018-03-17T04:13:23Z

Hydra have managed to build it now: https://nix-cache.s3.amazonaws.com/log/6qghl7v3bzdq1gpvdf16ankcmr3v6c22-webkitgtk-2.20.0.drv

Not sure what the problem was.

jtojnar · 2018-03-22T06:51:04Z

Merged as part of #36893

bendlas · 2018-03-23T22:29:50Z

Thanks for taking care of this, @jtojnar!

I've even got 2 commits sitting in my repo: one to add libgcrypt and one to restore 2.18 for Darwin, but I got completely distracted due to release week at work :-/

bendlas · 2018-04-05T20:25:03Z

oh jeez, I'm really glad we already updated https://webkitgtk.org/security/WSA-2018-0003.html

hedning · 2018-04-05T21:02:25Z

We really should backport it then though.

(cherry picked from commit f1b19d3) see #37050

(cherry picked from commit 562ae56) see #37050

this eliminates a build error due to /bin/bash in build scripts (cherry picked from commit 3a3ea1a) see #37050

(cherry picked from commit 9fa2844) see #37050

The build sometimes fails, mostly when using a single core. This is a simple stopgap, see upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788 (cherry picked from commit 5058529) see #37050

bendlas · 2018-04-05T21:23:43Z

Oh snap!
Thanks for the heads-up, @hedning

see #37050

@hrdinka

brotli is a runtime dependency, as per pc files in woff2.dev cc @hrdinka (cherry picked from commit 86fbdfd) #37050

bendlas · 2018-04-05T21:38:47Z

OK, two more fixes: For enchant2 not being backported and for a propagatedBuildInput fix, that was already in master. Build should come through now ...

bendlas · 2018-04-05T21:45:37Z

@hedning btw, do you think, that, with your determinism fix, we could also try to enable parallel builing again?

jtojnar · 2018-04-05T21:47:30Z

cmake should build in parallel by default: #32271

webkitgtk: 2.18 -> 2.20

7eb8b39

bendlas added 6.topic: darwin Running or building packages on Darwin 6.topic: GNOME GNOME desktop environment and its underlying platform 2.status: work-in-progress 8.has: package (update) 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 15, 2018

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 and removed 6.topic: GNOME GNOME desktop environment and its underlying platform labels Mar 15, 2018

webkitgtk: patch shebangs in postPatch

d8cbda1

this eliminates a build error due to /bin/bash in build scripts

jtojnar mentioned this pull request Mar 15, 2018

gnome3: 3.26 → 3.28 #36893

Merged

jtojnar closed this Mar 22, 2018

bendlas pushed a commit that referenced this pull request Apr 5, 2018

gnome3.webkitgtk: fix build

cb285dd

(cherry picked from commit f1b19d3) see #37050

bendlas added a commit that referenced this pull request Apr 5, 2018

webkitgtk: 2.18 -> 2.20

d9a2552

(cherry picked from commit 562ae56) see #37050

bendlas added a commit that referenced this pull request Apr 5, 2018

webkitgtk: patch shebangs in postPatch

ed6c49f

this eliminates a build error due to /bin/bash in build scripts (cherry picked from commit 3a3ea1a) see #37050

bendlas pushed a commit that referenced this pull request Apr 5, 2018

webkitgtk220x: cleanup

88c5eee

(cherry picked from commit 9fa2844) see #37050

bendlas added a commit that referenced this pull request Apr 5, 2018

webkitgtk: use enchant instead of enchant2

cae87f6

see #37050

bendlas reopened this Apr 5, 2018

bendlas added a commit that referenced this pull request Apr 5, 2018

woff2: propagate brotli build input

6aea1df

brotli is a runtime dependency, as per pc files in woff2.dev cc @hrdinka (cherry picked from commit 86fbdfd) #37050

bendlas closed this Apr 5, 2018

bendlas deleted the update-webkitgtk branch October 22, 2023 02:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

webkitgtk: 2.18 -> 2.20 #37050

webkitgtk: 2.18 -> 2.20 #37050

bendlas commented Mar 15, 2018 •

edited

jtojnar commented Mar 15, 2018

bendlas commented Mar 15, 2018

bendlas commented Mar 15, 2018

bendlas commented Mar 15, 2018

jtojnar commented Mar 15, 2018

bendlas commented Mar 15, 2018

jtojnar commented Mar 15, 2018

hedning commented Mar 17, 2018

hedning commented Mar 17, 2018

jtojnar commented Mar 22, 2018

bendlas commented Mar 23, 2018

bendlas commented Apr 5, 2018

hedning commented Apr 5, 2018

bendlas commented Apr 5, 2018

bendlas commented Apr 5, 2018

bendlas commented Apr 5, 2018

jtojnar commented Apr 5, 2018

webkitgtk: 2.18 -> 2.20 #37050

webkitgtk: 2.18 -> 2.20 #37050

Conversation

bendlas commented Mar 15, 2018 • edited

Things done

Update: as of second patch, build on nixos succeeds

Darwin support:

jtojnar commented Mar 15, 2018

bendlas commented Mar 15, 2018

bendlas commented Mar 15, 2018

bendlas commented Mar 15, 2018

jtojnar commented Mar 15, 2018

bendlas commented Mar 15, 2018

jtojnar commented Mar 15, 2018

hedning commented Mar 17, 2018

hedning commented Mar 17, 2018

jtojnar commented Mar 22, 2018

bendlas commented Mar 23, 2018

bendlas commented Apr 5, 2018

hedning commented Apr 5, 2018

bendlas commented Apr 5, 2018

bendlas commented Apr 5, 2018

bendlas commented Apr 5, 2018

jtojnar commented Apr 5, 2018

bendlas commented Mar 15, 2018 •

edited