From patchwork Mon Jan 16 17:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 46239 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB51727BBED; Tue, 17 Jan 2023 20:37:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F3DFD27BBE9 for ; Tue, 17 Jan 2023 20:37:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHshd-00079w-7Q; Tue, 17 Jan 2023 15:37:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHshb-00079h-Hm for guix-patches@gnu.org; Tue, 17 Jan 2023 15:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHsha-0001SZ-T3 for guix-patches@gnu.org; Tue, 17 Jan 2023 15:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHsha-00081Y-8z for guix-patches@gnu.org; Tue, 17 Jan 2023 15:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60864] [PATCH v2] gnu: Unify webkitgtk and webkitgtk-next. References: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> In-Reply-To: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Jan 2023 20:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60864@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 60864-submit@debbugs.gnu.org id=B60864.167398782130840 (code B ref 60864); Tue, 17 Jan 2023 20:37:02 +0000 Received: (at 60864) by debbugs.gnu.org; 17 Jan 2023 20:37:01 +0000 Received: from localhost ([127.0.0.1]:38382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHshZ-00081J-7z for submit@debbugs.gnu.org; Tue, 17 Jan 2023 15:37:01 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:38872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHshT-000812-UL for 60864@debbugs.gnu.org; Tue, 17 Jan 2023 15:36:59 -0500 Received: by mail-ej1-f68.google.com with SMTP id mg12so5883746ejc.5 for <60864@debbugs.gnu.org>; Tue, 17 Jan 2023 12:36:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=l42RZD50Cmge9avQEuWIxP9xmV8DkEO/bVajwLgSp+E=; b=n0TVOPy39Mo9pw0VMtQtARTuOnftXuqkAtU2+GAak3qgJ+jfaqeEiXuIAhzZVrqdAW V1N2N38RJ8Lix/7gzPHD9Gl38k3YCeEADgRYZiBk01jxNxrGl6WnWTxS1Qka9MdZ89sb yXN8oPmQ5CcxFy78XWhZIOBf62dRhQASL5c7Nxfumysviwi4qMJu7eJKveqMcy97JAXL VsIkVyUJDQJxVa5dbuQdtAUxfLmPXPtxaGNccYxLVVM1RyjkAVbH9Mx5KvU5m4L0W53l oI5CVbkScKuAnUl7ZQ80P4Uy3oxjEhUtQEvPCxCsjs3rzKZXPCLgs8QeN22CI8dxLQ4Z TlQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l42RZD50Cmge9avQEuWIxP9xmV8DkEO/bVajwLgSp+E=; b=fWrv640+Jv7s1SLe5oJftxx98pVp2NWv256QbmE3M2fbThKvw7A4ldHEfCgG4NOQ5E GZsNVcaonu9MjzYNEUGMqsXmRDJCHFnSCETrl2YvuT10xXBUVVewt7i75VUE5fWC9IGW +AUhQF9vEpbU058Zd2N1wr0HGyNnABNnCn9YozZ6i2pYJjQCc/G8loQfQuNsh+4JT7eX yHEvIDsyKZRnyrzeruWSVH4DALr3NV7DwePV1buLlAfpPbenaNxAB4D9HORN/wxHHOZz q+UEUEqq4i5Udocj+ndTjX9t+9JcsP+AQ2iiH3lkcvNyJd1i521lIkTmPiaWF5jhffdi cy3Q== X-Gm-Message-State: AFqh2kqAdQBn6BgzS65d9RM1Ay4U/MulujOpQYhtYG8dM5bvY8NaMB9N sToLQV9NLsw7hiKcifhcjGUsp/Iq93w= X-Google-Smtp-Source: AMrXdXuJqqXmw5mxbkPXVZ8HA9gzoxeDgtj1Cad2E1fLfps9ApF3TMwd8cs+XtUN0d8KSKVH4nb93A== X-Received: by 2002:a17:907:cf48:b0:86b:914a:576 with SMTP id uv8-20020a170907cf4800b0086b914a0576mr4105426ejc.6.1673987810023; Tue, 17 Jan 2023 12:36:50 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j17-20020a17090623f100b00770812e2394sm11422706ejg.160.2023.01.17.12.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 12:36:49 -0800 (PST) From: Liliana Marie Prikler Date: Mon, 16 Jan 2023 18:02:01 +0100 MIME-Version: 1.0 Message-ID: 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (%webkit-version): Update to 2.38.3. (webkitgtk)[source]: Update hash. [arguments]<#:phases>: Add ‘set-CC’. Remove ‘patch-gtk-doc-scan’. [native-inputs]: Remove gtk-doc/stable and docbook-xml. Add gi-docgen. (webkitgtk-next)[name]: Rename to ‘webkitgtk-next’. [source, native-inputs]: Inherit fully. [arguments]<#:phases>: Inherit fully. (wpewebkit)[source]: Update hash. --- In the previous version, I forgot to update teh hash of WPEWebkit. This is now done. Sadly, I've already had two builds failing due to the compiler getting killed near the end. I hope this is just a limitation on my end and not a general feature. Cheers gnu/packages/webkit.scm | 47 +++++++++++------------------------------ 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 29f89721b7..35fb5926a3 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -124,18 +124,18 @@ (define-public wpebackend-fdo engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.36.8") ;webkit2gtk4 +(define %webkit-version "2.38.3") (define-public webkitgtk (package - (name "webkitgtk") + (name "webkitgtk") ; webkit2gtk4 (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0dq4s0rw3cmsxlv22pc38qdsq4wx2yyq9wgsi4wgw243y9mzpn8a")) + (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -166,6 +166,11 @@ (define-public webkitgtk #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) #:phases #~(modify-phases %standard-phases + (add-before 'build 'set-CC + (lambda _ + ;; Some Perl scripts check for the CC environment variable, else + ;; use /usr/bin/gcc. + (setenv "CC" #$(cc-for-target)))) (add-after 'unpack 'configure-bubblewrap-store-directory (lambda _ ;; This phase works in tandem with @@ -189,12 +194,6 @@ (define-public webkitgtk ;; 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"))) @@ -223,9 +222,7 @@ (define-public webkitgtk perl pkg-config python-wrapper - ;; These are required to build the documentation. - gtk-doc/stable - docbook-xml + gi-docgen ruby)) (propagated-inputs (list gtk+ libsoup)) @@ -282,33 +279,13 @@ (define-public webkitgtk (define-public webkitgtk-next (package (inherit webkitgtk) - (name "webkitgtk") - (version "2.38.3") ;webkit2gtk5 - (source (origin - (inherit (package-source webkitgtk)) - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")))) - (build-system cmake-build-system) + (name "webkitgtk-next") ; webkit2gtk5 (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) #~(cons* "-DENABLE_INTROSPECTION=ON" "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'build 'set-CC - (lambda _ - ;; Some Perl scripts check for the CC environment variable, else - ;; use /usr/bin/gcc. - (setenv "CC" "gcc"))))))) - (native-inputs - (modify-inputs (package-native-inputs webkitgtk) - (delete "docbook-xml" "gtk-doc") - (append gi-docgen))) + (delete "-DENABLE_GTKDOC=ON" #$flags))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) (replace "gtk+" gtk))) @@ -340,7 +317,7 @@ (define-public wpewebkit (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1svmvj96c0lhdhs7fndgwchkvv4wyb7gwd4d3fbd1chhr54s6hld")))) + (base32 "160456k4yiml0zn2fxba9qwp94dvvn93z9rqs2qa2lvjxig0gn8x")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags)