From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WFpWJFzbS2L76AAAgWs5BA (envelope-from ) for ; Tue, 05 Apr 2022 08:02:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KEMdHVzbS2Kq2QAAG6o9tA (envelope-from ) for ; Tue, 05 Apr 2022 08:02:04 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id ABF8A1A9D6 for ; Tue, 5 Apr 2022 08:02:03 +0200 (CEST) Received: from localhost ([::1]:53204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbcGO-0005CT-1l for larch@yhetil.org; Tue, 05 Apr 2022 02:02:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbcEU-0005CF-J4 for guix-patches@gnu.org; Tue, 05 Apr 2022 02:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbcEU-00011a-93 for guix-patches@gnu.org; Tue, 05 Apr 2022 02:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbcEU-0005tr-2w for guix-patches@gnu.org; Tue, 05 Apr 2022 02:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 2/3] gnu: webkitgtk: Update to 2.36.0 and enable extra features. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Apr 2022 06:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , 54703@debbugs.gnu.org Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164913839022634 (code B ref 54703); Tue, 05 Apr 2022 06:00:01 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 05:59:50 +0000 Received: from localhost ([127.0.0.1]:53585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbcEC-0005sp-Ai for submit@debbugs.gnu.org; Tue, 05 Apr 2022 01:59:50 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:3401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbcE8-0005sc-KX for 54703@debbugs.gnu.org; Tue, 05 Apr 2022 01:59:42 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4KXcRT6WdMz3xZC; Tue, 5 Apr 2022 07:59:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1649138374; bh=VObLNYLVRuwoyT6viXSHPsOGEZHx9obXio2Wj3cr6P4=; h=Subject:From:To:Date:In-Reply-To:References; b=GNxGYCw5P01OvJ5cKImpYjQpg8iYB/6fVB4jTqVoUOoTLXqGBXKnlUh/chUBsA85y wHVrELbrWRv84PA+7l5PvJGiYWH9dZndq34juAOiuBtYOAK4OTltsZ8A4g7lbG/xq3 nETlFfnGPUA750P4por+QkS45H9LWfnjRdED2lkw= Message-ID: From: Liliana Marie Prikler Date: Tue, 05 Apr 2022 07:59:34 +0200 In-Reply-To: <20220405002705.28218-2-maxim.cournoyer@gmail.com> References: <20220405002705.28218-2-maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649138524; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=VObLNYLVRuwoyT6viXSHPsOGEZHx9obXio2Wj3cr6P4=; b=AdU/bxxRf/Gait34KjpRl9yardEbxr/nZZjljtkIfE3oyERx2PpKzTHD5KUQzc6L43P6eo MtJjomLnXOkubuCiMtKr1X0VHIr1RRX+ZygUjYsZ4JE3B1UAdd7QbfDRKQM2kFjRYN/CGf nb23kjidxulqBx4ch5DSmfTrpVGpRjxf8+A5OUrm6SCdVfD0uRK1yqj+/4Edb/ioI25zL8 Mm2OcSLgFQhb/F9/M9fb6c3bgdugOVDn/zyVEYSyx2Ybmii9iJqbeQ368JbISXLadJqfG0 mUVNUQB+NWOlFqWEx+hn388JsKzjx3vnhyeKVUTICAZMP/B6pL838HrowKwgqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649138524; a=rsa-sha256; cv=none; b=fHVenitKZD6T9GzDRYtsSUPuV73YMCpd7DGRCDTJH4Su4rw0gcZ+e7rnVAgB17XNVyRMVr OWFG0YCjQvAJtmpCvX9d1Hot1GTNtEGjm0i7S+o0m0RS7mjnwMxAtwT2nJRUleU2rnnoVV r/xq8m4xlxuB5AZ11PluQurqnD44Ad40TWxYQqCC/dCINMI70nRO7Ok93yBBtl0DHtgdmt iDMDS/sM81Z3io0nugKqZIrf9qUTfIqb7neStENoljw7/hn0nyhWG6TMBDU9jA2AxZs2xt Bm+Njtp9u859adABCQnUc1JJwH/PqskB9juwGY75D2nr0OvadpMKP0nc9bz2jQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=GNxGYCw5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=GNxGYCw5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: ABF8A1A9D6 X-Spam-Score: 5.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: Q9TRcdDoEzb9 Am Montag, dem 04.04.2022 um 20:27 -0400 schrieb Maxim Cournoyer: > * gnu/packages/webkit.scm (webkitgtk): Update to 2.36.0. > [source]: Remove the webkitgtk-bind-all-fonts.patch and > webkitgtk-canonicalize-paths.patch patches. I assume they were upstreamed? > [arguments]: Use gexp. > [tests?]: Update comment. > [build-type]: Add explanatory comment. > [configure-flags]: Enable gamepad support,  remove nonexistent > USE_SYSTEMD option, enable accelerated 2D canvas and mini-browser. > [phases]{do-not-disable-new-dtags}: New phase. > {help-cmake-find-elogind}: Likewise. > {patch-gtk-doc-scan}: Simplify to avoid for-each.  Locate > docbookx.dtd via > search-input-file. > {embed-absolute-wpebackend-reference}: Use search-input-file. > [native-inputs]: Use new style. > [inputs]: Likewise.  Add elogind and libmanette. > [description]: Adjust indentation. > (webkitgtk-with-libsoup2): Re-format comment, fixing spacing. > [configure-flags]: Use gexp. > [propagated-inputs]: Use modify-inputs to replace libsoup with > libsoup-minimal-2. > * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Delete file. > * gnu/packages/patches/webkitgtk-canonicalize-paths.patch: Likewise. > * gnu/local.mk: De-register them. > --- >  gnu/local.mk                                  |   2 - >  .../patches/webkitgtk-bind-all-fonts.patch    |  25 -- >  .../webkitgtk-canonicalize-paths.patch        |  66 ----- >  gnu/packages/webkit.scm                       | 232 ++++++++++------ > -- >  4 files changed, 124 insertions(+), 201 deletions(-) >  delete mode 100644 gnu/packages/patches/webkitgtk-bind-all- > fonts.patch >  delete mode 100644 gnu/packages/patches/webkitgtk-canonicalize- > paths.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index aac7362475..7f9c2fe1a1 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1931,9 +1931,7 @@ dist_patch_DATA > =                                         \ >    %D%/packages/patches/vte-CVE-2012-2738- > pt2.patch                     \ >    %D%/packages/patches/vtk-fix-freetypetools-build- > failure.patch       \ >    %D%/packages/patches/warsow-qfusion-fix-bool-return- > type.patch       \ > -  %D%/packages/patches/webkitgtk-bind-all-fonts.patch          \ >    %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ > -  %D%/packages/patches/webkitgtk-canonicalize-paths.patch      \ >    %D%/packages/patches/webrtc-audio-processing-big- > endian.patch        \ >    %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch    \ >    %D%/packages/patches/wicd-bitrate-none-fix.patch             \ > diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch > b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch > deleted file mode 100644 > index 27013180c4..0000000000 > --- a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -Upstream commit: > https://github.com/WebKit/WebKit/commit/31ac354cbeecf866f9a38f7b2f8f59f7975d3f6a > - > -diff --git > a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -index ecc804663784..8de174be3c0e 100644 > ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -@@ -288,6 +288,7 @@ static void bindFonts(Vector& args) > -     const char* homeDir = g_get_home_dir(); > -     const char* dataDir = g_get_user_data_dir(); > -     const char* cacheDir = g_get_user_cache_dir(); > -+    const char* const * dataDirs = g_get_system_data_dirs(); > - > -     // Configs can include custom dirs but then we have to parse > them... > -     GUniquePtr fontConfig(g_build_filename(configDir, > "fontconfig", nullptr)); > -@@ -304,6 +305,10 @@ static void bindFonts(Vector& args) > -     bindIfExists(args, fontHomeConfigDir.get()); > -     bindIfExists(args, fontData.get()); > -     bindIfExists(args, fontHomeData.get()); > -+    for (auto* dataDir = dataDirs; dataDir && *dataDir; dataDir++) > { > -+        GUniquePtr fontDataDir(g_build_filename(*dataDir, > "fonts", nullptr)); > -+        bindIfExists(args, fontDataDir.get()); > -+    } > -     bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian. > - } > - > diff --git a/gnu/packages/patches/webkitgtk-canonicalize-paths.patch > b/gnu/packages/patches/webkitgtk-canonicalize-paths.patch > deleted file mode 100644 > index 741d534831..0000000000 > --- a/gnu/packages/patches/webkitgtk-canonicalize-paths.patch > +++ /dev/null > @@ -1,66 +0,0 @@ > -Upstream commit: > https://github.com/WebKit/WebKit/commit/6a87eb254ef57a986a1a6ce9a3a4b66928afeb65 > - > -diff --git > a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -index ecc804663784..a2a1c9d7a4dd 100644 > ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp > -@@ -27,7 +27,6 @@ > - #include > - #include > - #include > --#include > - #include > - #include > - #include > -@@ -165,6 +164,15 @@ enum class BindFlags { > -     Device, > - }; > - > -+static void bindSymlinksRealPath(Vector& args, const char* > path, const char* bindOption = "--ro-bind") > -+{ > -+    WTF::String realPath = FileSystem::realPath(path); > -+    if (path != realPath) { > -+        CString rpath = realPath.utf8(); > -+        args.appendVector(Vector({ bindOption, > rpath.data(), rpath.data() })); > -+    } > -+} > -+ > - static void bindIfExists(Vector& args, const char* path, > BindFlags bindFlags = BindFlags::ReadOnly) > - { > -     if (!path || path[0] == '\0') > -@@ -177,7 +185,16 @@ static void bindIfExists(Vector& args, > const char* path, BindFlags bind > -         bindType = "--ro-bind-try"; > -     else > -         bindType = "--bind-try"; > --    args.appendVector(Vector({ bindType, path, path })); > -+ > -+    // Canonicalize the source path, otherwise a symbolic link > could > -+    // point to a location outside of the namespace. > -+    bindSymlinksRealPath(args, path, bindType); > -+ > -+    // As /etc is exposed wholesale, do not layer extraneous bind > -+    // directives on top, which could fail in the presence of > symbolic > -+    // links. > -+    if (!g_str_has_prefix(path, "/etc/")) > -+        args.appendVector(Vector({ bindType, path, path > })); > - } > - > - static void bindDBusSession(Vector& args, bool > allowPortals) > -@@ -410,17 +427,6 @@ static void bindV4l(Vector& args) > -     })); > - } > - > --static void bindSymlinksRealPath(Vector& args, const char* > path) > --{ > --    char realPath[PATH_MAX]; > -- > --    if (realpath(path, realPath) && strcmp(path, realPath)) { > --        args.appendVector(Vector({ > --            "--ro-bind", realPath, realPath, > --        })); > --    } > --} > -- > - // Translate a libseccomp error code into an error message. > libseccomp > - // mostly returns negative errno values such as -ENOMEM, but some > - // standard errno values are used for non-standard purposes where > their > diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm > index f79d6bd4f6..f453372b1e 100644 > --- a/gnu/packages/webkit.scm > +++ b/gnu/packages/webkit.scm > @@ -27,6 +27,7 @@ (define-module (gnu packages webkit) >    #:use-module ((guix licenses) #:prefix license:) >    #:use-module (guix packages) >    #:use-module (guix download) > +  #:use-module (guix gexp) >    #:use-module (guix utils) >    #:use-module (guix build utils) >    #:use-module (guix build-system cmake) > @@ -41,6 +42,7 @@ (define-module (gnu packages webkit) >    #:use-module (gnu packages flex) >    #:use-module (gnu packages fontutils) >    #:use-module (gnu packages freedesktop) > +  #:use-module (gnu packages games) >    #:use-module (gnu packages gcc) >    #:use-module (gnu packages gettext) >    #:use-module (gnu packages ghostscript) > @@ -239,121 +241,135 @@ (define-public wpewebkit >  (define-public webkitgtk >    (package >      (name "webkitgtk") > -    (version "2.34.6") > +    (version "2.36.0") >      (source (origin >                (method url-fetch) >                (uri (string-append > "https://www.webkitgtk.org/releases/" >                                    "webkitgtk-" version ".tar.xz")) >                (sha256 >                 (base32 > -                > "1xn1hhd0qaxmjf6vy6664i4mmmjsw9zgrr4w8ni3415d981zvj3b")) > -              (patches (search-patches "webkitgtk-bind-all- > fonts.patch" > -                                       "webkitgtk-adjust-bubblewrap- > paths.patch" > -                                       "webkitgtk-canonicalize- > paths.patch")))) > +                > "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) > +              (patches (search-patches > +                        "webkitgtk-adjust-bubblewrap- > paths.patch")))) >      (build-system cmake-build-system) >      (outputs '("out" "doc" "debug")) >      (arguments > -     `(#:tests? #f ; no tests > -       #:build-type "Release" ; turn off debugging symbols to save > space > -       #:configure-flags (list > -                          "-DPORT=GTK" > -                          "-DENABLE_GTKDOC=ON" ; No doc by default > -                          ;; Requires libmanette, new dependency > added in 2.32.0. > -                          ;; TODO Decide if we should enable this > -                          "-DENABLE_GAMEPAD=OFF" > -                          "-DUSE_SYSTEMD=OFF" > -                          (string-append ; uses lib64 by default > -                           "-DLIB_INSTALL_DIR=" > -                           (assoc-ref %outputs "out") "/lib")) > -       #:make-flags > -       ;; Never build with unsupported -j1: > https://issues.guix.gnu.org/47964#5 > -       (list "-j" (number->string (max 2 (parallel-job-count)))) > -       #:phases > -       (modify-phases %standard-phases > -         (add-after 'unpack 'configure-bubblewrap-store-directory > -           (lambda _ > -             ;; This phase is a corollary to 'webkitgtk-share- > store.patch' to > -             ;; avoid hard coding /gnu/store, for users with other > prefixes. > -             (let ((store-directory (%store-directory))) > -               (substitute* > -                   > "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" > -                 (("@storedir@") store-directory))))) > -         (add-after 'unpack 'patch-gtk-doc-scan > -           (lambda* (#:key inputs #:allow-other-keys) > -             (for-each (lambda (file) > -                         (substitute* file > -                           > (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") > -                            (string-append (assoc-ref inputs > "docbook-xml") > -                                           > "/xml/dtd/docbook/docbookx.dtd")))) > -                       (find-files "Source" "\\.sgml$")))) > -         (add-after 'unpack 'embed-absolute-wpebackend-reference > -           (lambda* (#:key inputs #:allow-other-keys) > -             (let ((wpebackend-fdo (assoc-ref inputs "wpebackend- > fdo"))) > -               (substitute* > "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" > -                 (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) > -                  (string-append wpebackend-fdo "/lib/" all)))))) > -         ,@(if (target-x86-64?) > -               '() > -               '((add-after 'unpack 'disable-sse2 > -                   (lambda _ > -                     (substitute* > "Source/cmake/WebKitCompilerFlags.cmake" > -                       (("WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING") > -                        "FALSE")))))) > -         (add-after 'install 'move-doc-files > -           (lambda* (#:key outputs #:allow-other-keys) > -             (let ((out (assoc-ref outputs "out")) > -                   (doc (assoc-ref outputs "doc"))) > -               (mkdir-p (string-append doc "/share")) > -               (rename-file (string-append out "/share/gtk-doc") > -                            (string-append doc "/share/gtk- > doc")))))))) > +     (list > +      ;; The release archive doesn't include the resources/sources > needed to > +      ;; run the various regression tests. > +      #:tests? #f > +      ;; When building using the default RelWithDebInfo build type, > the final > +      ;; binaries require 20 GiB of memory to link (even with > ld.gold or lld) > +      ;; and produce 4.6 GiB of debug symbols. > +      #:build-type "Release" > +      #:configure-flags #~(list > +                           "-DPORT=GTK" > +                           "-DENABLE_GTKDOC=ON" ;disabled by default > +                           "-DENABLE_ACCELERATED_2D_CANVAS=ON" > ;disabled by default > +                           "-DENABLE_MINIBROWSER=ON" ;disabled by > default Rather than saying "disabled by default" we should probably say why we're enabling them if upstream thinks that's unwise to do. > +                           ;; The default lib installation prefix is > lib64. > +                           (string-append "-DLIB_INSTALL_DIR=" > #$output "/lib")) > +      ;; The build may fail with -j1 (see: > +      ;; https://bugs.webkit.org/show_bug.cgi?id=195251). > +      #:make-flags #~(list "-j" (number->string (max 2 (parallel- > job-count)))) > +      #:phases > +      #~(modify-phases %standard-phases > +          (add-after 'unpack 'configure-bubblewrap-store-directory > +            (lambda _ > +              ;; This phase is a corollary to 'webkitgtk-share- > store.patch' to > +              ;; avoid hard coding /gnu/store, for users with other > prefixes. That patch no longer exists AFAICS, so the comment needs to be updated. > +              (let ((store-directory (%store-directory))) > +                (substitute* > +                    > "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" > +                  (("@storedir@") store-directory))))) > +          (add-after 'unpack 'do-not-disable-new-dtags > +            ;; Ensure the linker uses new dynamic tags as this is > what Guix > +            ;; uses and validates in the validate-runpath phase. > +            (lambda _ > +              (substitute* "Source/cmake/OptionsCommon.cmake" > +                (("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)") > +                 "if (FALSE)")))) > +          (add-after 'unpack 'help-cmake-find-elogind > +            (lambda _ > +              (substitute* "Source/cmake/FindJournald.cmake" > +                ;; Otherwise, CMake would throw an error because it > relies on > +                ;; the pkg-config search to locate headers. > +                (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd") > +                 "pkg_check_modules(PC_SYSTEMD QUIET libelogind")))) > +          (add-after 'unpack 'patch-gtk-doc-scan > +            (lambda* (#:key native-inputs inputs #:allow-other-keys) > +              (substitute* (find-files "Source" "\\.sgml$") > +                > (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") > +                 (search-input-file (or native-inputs inputs) > +                                    > "xml/dtd/docbook/docbookx.dtd"))))) > +          (add-after 'unpack 'embed-absolute-wpebackend-reference > +            (lambda* (#:key inputs #:allow-other-keys) > +              (let ((wpebackend-fdo (assoc-ref inputs "wpebackend- > fdo"))) > +                (substitute* > "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" > +                  (("libWPEBackend-fdo-[\\.0-9]+\\.so" all) > +                   (search-input-file inputs (string-append "lib/" > all))))))) > +          #$@(if (target-x86-64?) > +                 '() > +                 '((add-after 'unpack 'disable-sse2 > +                     (lambda _ > +                       (substitute* > "Source/cmake/WebKitCompilerFlags.cmake" > +                         (("WTF_CPU_X86 AND NOT > CMAKE_CROSSCOMPILING") > +                          "FALSE")))))) > +          (add-after 'install 'move-doc-files > +            (lambda* (#:key outputs #:allow-other-keys) > +              (let ((doc (assoc-ref outputs "doc"))) > +                (mkdir-p (string-append doc "/share")) > +                (rename-file (string-append #$output "/share/gtk- > doc") > +                             (string-append doc "/share/gtk- > doc")))))))) >      (native-inputs > -     `(("bison" ,bison) > -       ("gettext" ,gettext-minimal) > -       ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. > -       ("gobject-introspection" ,gobject-introspection) > -       ("gperf" ,gperf) > -       ("perl" ,perl) > -       ("pkg-config" ,pkg-config) > -       ("python" ,python-wrapper) > -       ("gtk-doc" ,gtk-doc/stable) ; For documentation generation > -       ("docbook-xml" ,docbook-xml) ; For documentation generation > -       ("ruby" ,ruby))) > +     (list bison > +           gettext-minimal > +           `(,glib "bin")               ;for glib-mkenums, etc. > +           gobject-introspection > +           gperf > +           perl > +           pkg-config > +           python-wrapper > +           gtk-doc/stable               ;for documentation > generation > +           docbook-xml                  ;for documentation > generation I think "for documentation" would be enough here. Small nitpick: What's it with all the lacking spaces after the semicolons? > +           ruby)) >      (propagated-inputs >       (list gtk+ libsoup)) >      (inputs > -     `(("at-spi2-core" ,at-spi2-core) > -       ("bubblewrap" ,bubblewrap) > -       ("enchant" ,enchant) > -       ("geoclue" ,geoclue) > -       ("gst-plugins-base" ,gst-plugins-base) > -       ("gtk+-2" ,gtk+-2) > -       ("harfbuzz" ,harfbuzz) > -       ("hyphen" ,hyphen) > -       ("icu4c" ,icu4c) > -       ("lcms" ,lcms) > -       ("libgcrypt" ,libgcrypt) > -       ("libjpeg" ,libjpeg-turbo) > -       ("libnotify" ,libnotify) > -       ("libpng" ,libpng) > -       ("libseccomp" ,libseccomp) > -       ("libsecret" ,libsecret) > -       ("libtasn1" ,libtasn1) > -       ("libwebp" ,libwebp) > -       ("libwpe" ,libwpe) > -       ("libxcomposite" ,libxcomposite) > -       ("libxml2" ,libxml2) > -       ("libxslt" ,libxslt) > -       ("libxt" ,libxt) > -       ("mesa" ,mesa) > -       ("openjpeg" ,openjpeg) > -       ("sqlite" ,sqlite) > -       ("woff2" ,woff2) > -       ("wpebackend-fdo" ,wpebackend-fdo) > -       ("xdg-dbus-proxy" ,xdg-dbus-proxy))) > +     (list at-spi2-core > +           bubblewrap > +           elogind > +           enchant > +           geoclue > +           gst-plugins-base > +           gtk+-2 > +           harfbuzz > +           hyphen > +           icu4c > +           lcms > +           libgcrypt > +           libjpeg-turbo > +           libmanette > +           libnotify > +           libpng > +           libseccomp > +           libsecret > +           libtasn1 > +           libwebp > +           libwpe > +           libxcomposite > +           libxml2 > +           libxslt > +           libxt > +           mesa > +           openjpeg > +           sqlite > +           woff2 > +           wpebackend-fdo > +           xdg-dbus-proxy)) >      (home-page "https://www.webkitgtk.org/") >      (synopsis "Web content engine for GTK+") > -    (description > -     "WebKitGTK+ is a full-featured port of the WebKit rendering > engine, > +    (description "WebKitGTK+ is a full-featured port of the WebKit > rendering engine, >  suitable for projects requiring any kind of web integration, from > hybrid >  HTML/CSS applications to full-fledged web browsers.  WebKitGTK+ > video playing >  capabilities can be extended through the use of GStreamer plugins > (not > @@ -366,17 +382,17 @@ (define-public webkitgtk >                     license:bsd-2 >                     license:bsd-3)))) >   > -;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates > libsoup 3, > -;;; which causes the build to fail. > -;;; Also required by e.g. emacs-next-pgtk,  emacs-xwidgets, and some > other > -;;; Gnome packages for webkit2gtk-4.0. See also the upstream tracker > for > -;;; libsoup 3: https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 > +;;; Required by gnome-online-accounts as webkitgtk propagates > libsoup 3, which > +;;; causes the build to fail.  Also required by e.g. emacs-next- > pgtk, > +;;; emacs-xwidgets, and some other GNOME packages for webkit2gtk- > 4.0.  See > +;;; also the upstream tracker for libsoup 3: > +;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 >  (define-public webkitgtk-with-libsoup2 >    (package/inherit webkitgtk >      (name "webkitgtk-with-libsoup2") >      (arguments (substitute-keyword-arguments (package-arguments > webkitgtk) >                   ((#:configure-flags flags) > -                  `(cons "-DUSE_SOUP2=ON" ,flags)))) > +                  #~(cons "-DUSE_SOUP2=ON" #$flags)))) >      (propagated-inputs > -     (alist-replace "libsoup" (list libsoup-minimal-2) > -                    (package-propagated-inputs webkitgtk))))) > +     (modify-inputs (package-propagated-inputs webkitgtk) > +       (replace "libsoup" libsoup-minimal-2))))) Otherwise LGTM. You might however want to wait for more comments, particularly lfam's security advice :)