From unknown Sun Jun 22 13:36:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60864] [PATCH] gnu: Unify webkitgtk and webkitgtk-next. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60864@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167388943429133 (code B ref -1); Mon, 16 Jan 2023 17:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2023 17:17:14 +0000 Received: from localhost ([127.0.0.1]:34584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6g-0007Zo-5E for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:35280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6c-0007Zd-58 for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17:12 -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 1pHT6U-0003Vi-Ra for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:04 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHT6S-00025S-VG for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:02 -0500 Received: by mail-ej1-x644.google.com with SMTP id tz11so5222914ejc.0 for ; Mon, 16 Jan 2023 09:17:00 -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=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=A8lE1yuZaWcFaK8J4BcsP0bozUdMC3J9rT6vjWE2PyOs5frsEo6YxNNTrrK5Q1U7k3 VViwfTW01DRMcyQkhVPxxQYDkqfLXhYb4wrom7lC6Nl97zcPHUc77WJ6xNpOr5eM8t0H 3uhcGRxXUruhq4dywmWLH1+Xz66LaWx5+Ll4zI5aMpwTqz3eDYtl0FMGrALN5bC6GZ5p 092hahNZpX0jnW+JNHv6zxOYTHIYDrpWBqiVIgKeElcQ1hA3eefr+7WwGYuUeTWL1i+H /UtMdB0laXO+Yy+7krR11qh87vedmflZNhtyFjt4p1GHSkEkzwew9kEmbJC5KWdaasv0 5erg== 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=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=8H307MkWJYINUHk0zqGSePyMA3C7MJWphmLw4ruuOGZxI9I7yvzy/xP/JkPnJNlYFk WodmgCwZaxtAFXuLngMpz7EOl3AOABCcXOxkwBgkiNfN/Q9gxJXLdJD9/Z3kk4jRW3MT GvXXHs/p+y2bqMc09TEJA+epB01zGEmRGvTO0w25kCFNZUMJSmJiEB0PmosehhQIm0LL 07i820SMMWERQ30Z+xJDQZ7LUdf2A4bNdVBy/oWCRcdgix7IyKN+QgvIg36/85Ipf23m OrlVCU+YwV/h6QJGssF1wHKrFvXlCbAIDGyWKrhKw/2CPgIoTXPXDNu+mBtjEgi49ICa Fh3w== X-Gm-Message-State: AFqh2kogDc+TuqS8XaMN6azxtjuS/PegsnrEhU61+elN3WoDdT1Wn7PY wv8W2SFt2PQZbem/uRpp4rNAVwu6+ec= X-Google-Smtp-Source: AMrXdXuQvwKT2DmovqLXfwP4YXcj1hxl/UOG6F07E7hpv2+Y+nz4J8fyKsS+yghkZxDRBtykfnNEmA== X-Received: by 2002:a17:907:a609:b0:7c1:22a6:818f with SMTP id vt9-20020a170907a60900b007c122a6818fmr15396185ejc.25.1673889418923; Mon, 16 Jan 2023 09:16:58 -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 r2-20020a17090609c200b007bd28b50305sm12059647eje.200.2023.01.16.09.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 09:16:58 -0800 (PST) From: Liliana Marie Prikler Date: Mon, 16 Jan 2023 18:02:01 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x644.google.com X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RAZOR2_CF_RANGE_51_100=1.886, RAZOR2_CHECK=0.922, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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. --- Hi Guix, our Webkit packages diverged a little with the introduction of webkitgtk-next. Since the only difference between it and regular webkitgtk is the use of gtk4 as toolkit, however, I think that resynchronizing them might be better overall. Cheers gnu/packages/webkit.scm | 45 ++++++++++------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 29f89721b7..400cf8372c 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))) -- 2.38.1 From unknown Sun Jun 22 13:36:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60864] [PATCH] gnu: Unify webkitgtk and webkitgtk-next. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 21:44: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: Liliana Marie Prikler Cc: 60864@debbugs.gnu.org Received: via spool by 60864-submit@debbugs.gnu.org id=B60864.16739053839716 (code B ref 60864); Mon, 16 Jan 2023 21:44:02 +0000 Received: (at 60864) by debbugs.gnu.org; 16 Jan 2023 21:43:03 +0000 Received: from localhost ([127.0.0.1]:35117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHXFu-0002We-Tt for submit@debbugs.gnu.org; Mon, 16 Jan 2023 16:43:03 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:37447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHXFr-0002W6-Re for 60864@debbugs.gnu.org; Mon, 16 Jan 2023 16:43:00 -0500 Received: by mail-qt1-f173.google.com with SMTP id j9so2964534qtv.4 for <60864@debbugs.gnu.org>; Mon, 16 Jan 2023 13:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ysdqu9f63/N3Z1JY9Yo4DAwN6Xuyq/XJgr2Ks+yEOPk=; b=WfPt1887dNRSiJ6n2QcgK9VHWcl6YvKqzQtrYUmoOhZMhvNTLtAgzVkG/ly9khalxb fAJ+n++OIFPMvK/QEEZ5GEtMnXQHsyaRrsNi918Zqszzvka8w62MY20er1+6wM0zYGIv 10YovkjfhC5791EMJmEXfmR0YpFPrmupaLBvH19fvVZTsuTZfWBMQXavFqN5oKQKPZis E8Nbwho4ZuqMYSs4d/QmfjgYKxhX/4ZT1C4d1iAp6gEwm2gxikvN0bI7mxZBBfWCPtS0 PAMtI9cwFmDERUe3K5/gLSrplLme0EEyAxP7SBimJBKMMIYl/E2VJ1+RztoRIi3N01br Raqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ysdqu9f63/N3Z1JY9Yo4DAwN6Xuyq/XJgr2Ks+yEOPk=; b=FoYz/uPFhPS89XtHnk3xXFNuMmL6F0lGFoVjCS8CZ+eR3XaKvhRWz1Pp7ew6+Xh5VN FNBLmtCCEpGoE2gU59sWORciFJGfTPhKOVXkq+5MEAslZ04/RJ5ce7DiZwl1kgSulo0C cO30UlyB+BhYEnjPoly+lQ+7EhCANp3lN1M/43587RkyOodpdKfSsaqaE9BvYQLNyhbR SgvYu/2SP2wChcTIop1zgaaNymT7YlVfKcTkaoYMGnQo6G2JdLnza1UKK7CHRt4yUEJo THD7mLYAd3Y4MhIDIXck6h70p0AEO8zzDKbbsBXyJX207ovKpgD6GXpGDJkLiJp4boDr hDgQ== X-Gm-Message-State: AFqh2krq61XIdw+YL43aJ6tcWls30TUKfkp1+XlzLnti/2s8jtcM5GAy 4cj6dLYpIHPMTbxmTcG67OUBwuQP/25AXVqV X-Google-Smtp-Source: AMrXdXvOGr0xF8nsIQzcndYUT0JmBc8Zc2B2Jf9D+Wc0UoEv5QGohRORGLL+bolDtnqOFz8vR4Ztbw== X-Received: by 2002:ac8:7312:0:b0:3ab:7bb3:4707 with SMTP id x18-20020ac87312000000b003ab7bb34707mr562563qto.64.1673905374022; Mon, 16 Jan 2023 13:42:54 -0800 (PST) Received: from hurd (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id q44-20020a05620a2a6c00b006fc9fe67e34sm4719916qkp.81.2023.01.16.13.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 13:42:53 -0800 (PST) From: Maxim Cournoyer References: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> Date: Mon, 16 Jan 2023 16:42:52 -0500 In-Reply-To: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 16 Jan 2023 18:02:01 +0100") Message-ID: <87y1q22m1v.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, Liliana Marie Prikler writes: > * gnu/packages/webkit.scm (%webkit-version): Update to 2.38.3. > (webkitgtk)[source]: Update hash. > [arguments]<#:phases>: Add =E2=80=98set-CC=E2=80=99. Remove =E2=80=98pat= ch-gtk-doc-scan=E2=80=99. > [native-inputs]: Remove gtk-doc/stable and docbook-xml. Add gi-docgen. > (webkitgtk-next)[name]: Rename to =E2=80=98webkitgtk-next=E2=80=99. > [source, native-inputs]: Inherit fully. > [arguments]<#:phases>: Inherit fully. > --- > Hi Guix, > > our Webkit packages diverged a little with the introduction of webkitgtk-= next. > Since the only difference between it and regular webkitgtk is the use of > gtk4 as toolkit, however, I think that resynchronizing them might be bett= er > overall. LGTM! --=20 Thanks, Maxim From unknown Sun Jun 22 13:36:13 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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) -- 2.38.1 From unknown Sun Jun 22 13:36:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60864] [PATCH v2] gnu: Unify webkitgtk and webkitgtk-next. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 13:46: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: Liliana Marie Prikler Cc: 60864@debbugs.gnu.org Received: via spool by 60864-submit@debbugs.gnu.org id=B60864.16744815054454 (code B ref 60864); Mon, 23 Jan 2023 13:46:02 +0000 Received: (at 60864) by debbugs.gnu.org; 23 Jan 2023 13:45:05 +0000 Received: from localhost ([127.0.0.1]:53698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJx8C-00019m-JI for submit@debbugs.gnu.org; Mon, 23 Jan 2023 08:45:04 -0500 Received: from mail-vs1-f48.google.com ([209.85.217.48]:46958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJx8B-00018t-Tj for 60864@debbugs.gnu.org; Mon, 23 Jan 2023 08:45:04 -0500 Received: by mail-vs1-f48.google.com with SMTP id j185so12843231vsc.13 for <60864@debbugs.gnu.org>; Mon, 23 Jan 2023 05:45:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=wr2y7NWLSP16/LKvfqK0qMIewLZbAP1ytFQrNvKuuGk=; b=G24PqJb8bLbFiHISoF53bdBRBlTelBWzC4wfu5PNEAue5SBTQC5F7UHxIpOhL1Lczh 17cxzbp3ddDyOhFsVtKLVxlUwRLqWn0V/Xrc6x5IcBhx5IssuB/Qbvlk6NoFnx9Fz2eu rtYpK6AiPH9aGGZc2CVNE2vKvKuC1uPAaYF59anV6JkjPPGi2FwSZLw4Ms10usH5xuU/ cM0wLXiSh01APzNyE2mc9AG+IjYlKAW00UF1mFyJxuOSCeJY5uR1RtarA96QY8H0z/f9 M7wv91DqiQMYH5UmPyvy7S+9PlrXKFjFFQgYEdunR9AgzqBc9mlCoJ8G8LNyfd9PQNpj XKoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wr2y7NWLSP16/LKvfqK0qMIewLZbAP1ytFQrNvKuuGk=; b=j0Msbja8D7hXHufjFdeDOMczbeVQBUC+CFezBjWJmJRz8FqDwtUkj7c0StIjy9ZvuR x3rVpqPKtTT+MyvnKJtPnYEtJz1YIV5lVPvAPqHh/tlc/CNJ24k0GmI9Bcm9uotwUnwa oEyVKlsioDzxd71VFM51QLSVTrbRSbRx+XwBOqKRnNxJMQb8pQWAEhlE4+QtRClIqpRZ Eej0C7v5ivthNoC+M7V4PRtDh5h54YGC1Mwmf6zVY5mGuTw2yxEhXlSygtz3u1w6L4/u M/MHLMgndxBXAI3y3814BfrGNP80eCsWmGq8nXMXPItbrHQID66gEc/dbKi2dBuiOsb/ gLSw== X-Gm-Message-State: AFqh2koxSD8YLblkSqSYMR6PhgVpefrdmWgLBqmPfeiLyBUZY7y7yM6P rO+gMYHHRqcHsz9OwcHw7O5WO/GNtcsGmfvG X-Google-Smtp-Source: AMrXdXtRUbd33UXwVE3N1jLif1tfbH6tx4PPXadqFZjhk6xkpeYf+lcaDZg1wsIewRRuHDwlRJ2T0Q== X-Received: by 2002:a05:6102:5094:b0:3d3:cb01:4970 with SMTP id bl20-20020a056102509400b003d3cb014970mr18587358vsb.31.1674481498198; Mon, 23 Jan 2023 05:44:58 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id bs15-20020a05620a470f00b006b61b2cb1d2sm31850570qkb.46.2023.01.23.05.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:44:57 -0800 (PST) From: Maxim Cournoyer References: Date: Mon, 23 Jan 2023 08:44:56 -0500 In-Reply-To: (Liliana Marie Prikler's message of "Mon, 16 Jan 2023 18:02:01 +0100") Message-ID: <877cxdz7on.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, Liliana Marie Prikler writes: > * gnu/packages/webkit.scm (%webkit-version): Update to 2.38.3. > (webkitgtk)[source]: Update hash. > [arguments]<#:phases>: Add =E2=80=98set-CC=E2=80=99. Remove =E2=80=98pat= ch-gtk-doc-scan=E2=80=99. > [native-inputs]: Remove gtk-doc/stable and docbook-xml. Add gi-docgen. > (webkitgtk-next)[name]: Rename to =E2=80=98webkitgtk-next=E2=80=99. > [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. I just built both successfully here (x86_64); LGTM. --=20 Thanks, Maxim From unknown Sun Jun 22 13:36:13 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Liliana Marie Prikler Subject: bug#60864: closed (Re: [PATCH v2] gnu: Unify webkitgtk and webkitgtk-next.) Message-ID: References: <637aaaa3f37a5aed6a32ec8fef8bf8f2f8c0a09a.camel@gmail.com> <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> X-Gnu-PR-Message: they-closed 60864 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 60864@debbugs.gnu.org Date: Sun, 29 Jan 2023 07:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1674977342-32744-1" This is a multi-part message in MIME format... ------------=_1674977342-32744-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60864: [PATCH] gnu: Unify webkitgtk and webkitgtk-next. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60864@debbugs.gnu.org. --=20 60864: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60864 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1674977342-32744-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60864-done) by debbugs.gnu.org; 29 Jan 2023 07:28:11 +0000 Received: from localhost ([127.0.0.1]:42148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM26k-0008Us-Vz for submit@debbugs.gnu.org; Sun, 29 Jan 2023 02:28:11 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:40587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM26j-0008Ug-Cf for 60864-done@debbugs.gnu.org; Sun, 29 Jan 2023 02:28:10 -0500 Received: by mail-ej1-f65.google.com with SMTP id me3so23855263ejb.7 for <60864-done@debbugs.gnu.org>; Sat, 28 Jan 2023 23:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Q+zcn33B2hsDstvkc/aObYBNsG7YFLGYkbXUowbXzdo=; b=ZfR7mTh/MBZ4qsCE/tcpQEksYrVT7x0GlKVkwRyFvxWeK5Dnm0Z5kaKOtNzz1dIBDY IgYGAdPp4w4Drr7+pAU9MXGNYqf7SN242a0SEmGiOucQ6PdCN8dTTculXPVT+YUGRWUD aE6saf4foU6VNm3cfGdIdx+0DeWJIzYs8y1Ph22tkcia7514mC95l377WiCBQJqvR4Cz Vklj1u2CeeUzOHICbsZAed+xITVmyb6vbotm30kFiwqaO+y1AHPpl0PrbMLFum+nz2r1 Efyzzs0jwdRSwFwPDAR3RIpC6bsy1RoE//rAM28lUmNhcyVVgyznlEZKwrjgNwGZZl5R B3pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q+zcn33B2hsDstvkc/aObYBNsG7YFLGYkbXUowbXzdo=; b=qoEZTLSDHUq97t0Y2GTL7B5u7kOo5K1ajgzLGMq/H3Xoq8RYKKsYzrV6f1rQQ8EO6s QjXXuOL6ks8fmMgj4zr2kutXGHs/rRmmffnoEstHdTQktO+ZK81vt3X65CYDjK1b1YH4 1/IN56Z5W9YYGoEj3P/JdIOmwZz3DmjprobK0xrvDGN0W7p58s2FKLB0d7XFhzsWSmvc AiDnxhpwduLXYuCG6VTggcr0lQAHKApBBNCMvCupnB7jTKoqkrnIeSnbj019ika42DD4 B/warBNeFOO4IJd0VF2yXdsQPXFRuHBQ2yRjTo8WiFOI2wU08RUCtpF4YMBG6wG5x+g7 tyhA== X-Gm-Message-State: AFqh2kqC1eSNUQ3/p0okQGrODRCk/5czvbmSxHT4VVR+rewhT6xPBRK/ nmcdGnAGXwENmsjLMfXYn0g= X-Google-Smtp-Source: AMrXdXuMVi1eZHmexSxm47aIUI5VkbqVoALJjwNPtKsc4YQNyw40Cacs4rWl5nRs5gvQlqYQYzEKlA== X-Received: by 2002:a17:906:70c7:b0:84c:a863:ebe6 with SMTP id g7-20020a17090670c700b0084ca863ebe6mr38433115ejk.43.1674977283413; Sat, 28 Jan 2023 23:28:03 -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 t4-20020a170906948400b0084c4b87aa18sm4906800ejx.37.2023.01.28.23.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 23:28:02 -0800 (PST) Message-ID: <637aaaa3f37a5aed6a32ec8fef8bf8f2f8c0a09a.camel@gmail.com> Subject: Re: [PATCH v2] gnu: Unify webkitgtk and webkitgtk-next. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sun, 29 Jan 2023 08:27:59 +0100 In-Reply-To: <877cxdz7on.fsf@gmail.com> References: <877cxdz7on.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60864-done Cc: 60864-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 23.01.2023 um 08:44 -0500 schrieb Maxim Cournoyer: > Hi Liliana, >=20 > Liliana Marie Prikler writes: >=20 > > * gnu/packages/webkit.scm (%webkit-version): Update to 2.38.3. > > (webkitgtk)[source]: Update hash. > > [arguments]<#:phases>: Add =E2=80=98set-CC=E2=80=99.=C2=A0 Remove =E2= =80=98patch-gtk-doc-scan=E2=80=99. > > [native-inputs]: Remove gtk-doc/stable and docbook-xml.=C2=A0 Add gi- > > docgen. > > (webkitgtk-next)[name]: Rename to =E2=80=98webkitgtk-next=E2=80=99. > > [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. > >=20 > > Sadly, I've already had two builds failing due to the compiler > > getting killed near the end.=C2=A0 I hope this is just a limitation on > > my end and not a general feature. >=20 > I just built both successfully here (x86_64); LGTM. Thanks for the review. Pushed now. ------------=_1674977342-32744-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Jan 2023 17:17:14 +0000 Received: from localhost ([127.0.0.1]:34584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6g-0007Zo-5E for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:35280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6c-0007Zd-58 for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17:12 -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 1pHT6U-0003Vi-Ra for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:04 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHT6S-00025S-VG for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:02 -0500 Received: by mail-ej1-x644.google.com with SMTP id tz11so5222914ejc.0 for ; Mon, 16 Jan 2023 09:17:00 -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=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=A8lE1yuZaWcFaK8J4BcsP0bozUdMC3J9rT6vjWE2PyOs5frsEo6YxNNTrrK5Q1U7k3 VViwfTW01DRMcyQkhVPxxQYDkqfLXhYb4wrom7lC6Nl97zcPHUc77WJ6xNpOr5eM8t0H 3uhcGRxXUruhq4dywmWLH1+Xz66LaWx5+Ll4zI5aMpwTqz3eDYtl0FMGrALN5bC6GZ5p 092hahNZpX0jnW+JNHv6zxOYTHIYDrpWBqiVIgKeElcQ1hA3eefr+7WwGYuUeTWL1i+H /UtMdB0laXO+Yy+7krR11qh87vedmflZNhtyFjt4p1GHSkEkzwew9kEmbJC5KWdaasv0 5erg== 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=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=8H307MkWJYINUHk0zqGSePyMA3C7MJWphmLw4ruuOGZxI9I7yvzy/xP/JkPnJNlYFk WodmgCwZaxtAFXuLngMpz7EOl3AOABCcXOxkwBgkiNfN/Q9gxJXLdJD9/Z3kk4jRW3MT GvXXHs/p+y2bqMc09TEJA+epB01zGEmRGvTO0w25kCFNZUMJSmJiEB0PmosehhQIm0LL 07i820SMMWERQ30Z+xJDQZ7LUdf2A4bNdVBy/oWCRcdgix7IyKN+QgvIg36/85Ipf23m OrlVCU+YwV/h6QJGssF1wHKrFvXlCbAIDGyWKrhKw/2CPgIoTXPXDNu+mBtjEgi49ICa Fh3w== X-Gm-Message-State: AFqh2kogDc+TuqS8XaMN6azxtjuS/PegsnrEhU61+elN3WoDdT1Wn7PY wv8W2SFt2PQZbem/uRpp4rNAVwu6+ec= X-Google-Smtp-Source: AMrXdXuQvwKT2DmovqLXfwP4YXcj1hxl/UOG6F07E7hpv2+Y+nz4J8fyKsS+yghkZxDRBtykfnNEmA== X-Received: by 2002:a17:907:a609:b0:7c1:22a6:818f with SMTP id vt9-20020a170907a60900b007c122a6818fmr15396185ejc.25.1673889418923; Mon, 16 Jan 2023 09:16:58 -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 r2-20020a17090609c200b007bd28b50305sm12059647eje.200.2023.01.16.09.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 09:16:58 -0800 (PST) From: Liliana Marie Prikler Date: Mon, 16 Jan 2023 18:02:01 +0100 Subject: [PATCH] gnu: Unify webkitgtk and webkitgtk-next. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: guix-patches@gnu.org Message-ID: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x644.google.com X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RAZOR2_CF_RANGE_51_100=1.886, RAZOR2_CHECK=0.922, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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. --- Hi Guix, our Webkit packages diverged a little with the introduction of webkitgtk-next. Since the only difference between it and regular webkitgtk is the use of gtk4 as toolkit, however, I think that resynchronizing them might be better overall. Cheers gnu/packages/webkit.scm | 45 ++++++++++------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 29f89721b7..400cf8372c 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))) -- 2.38.1 ------------=_1674977342-32744-1--