diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:18:46 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:18:46 +0100 |
| commit | 6b881028a3f9c01eb4b3d0ab2e8058105cb59207 (patch) | |
| tree | 8e738c4e04a21ba45a22ebbecd521a5d761a5d52 /gnu/packages/webkit.scm | |
| parent | c364566cb7286bf96e358bdd132cda3c6322feff (diff) | |
| parent | 3d2966e0b7dbf15a5cb497037ace73d1be92febf (diff) | |
| download | guix-6b881028a3f9c01eb4b3d0ab2e8058105cb59207.tar guix-6b881028a3f9c01eb4b3d0ab2e8058105cb59207.tar.gz | |
Merge commit '3d2966e0b7' into core-update-new-2
Change-Id: I532430d9692b48cb3fbde2af8753b7d9829aa1da
Conflicts:
gnu/local.mk
gnu/packages/freedesktop.scm
gnu/packages/java.scm
gnu/packages/llvm.scm
gnu/packages/man.scm
gnu/packages/telegram.scm
gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d359d01f98..bf24a65e83 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,20 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.42.4") + (version "2.42.5") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "11pdcwmdj3i9aarrf7wsfvadi6jnkaf6zf7c5i2768x2plq8na2j")) + (base32 "0jg7c7z572afywwrnvdj3m5agaviv0vkqmzznnzzv30byb0phhmn")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; https://bugs.webkit.org/show_bug.cgi?id=268739 + ;; Fix a FTBFS on i686, powerpc64le. + (substitute* "Source/JavaScriptCore/llint/LowLevelInterpreter.cpp" + (("UNUSED_VARIABLE\\(t[67]\\);") "")))) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) |