From unknown Sun Jun 22 11:35:44 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66480 <66480@debbugs.gnu.org> To: bug#66480 <66480@debbugs.gnu.org> Subject: Status: [PATCH gnome-team WIP 0/2] Update WebkitGTK Reply-To: bug#66480 <66480@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:35:44 +0000 retitle 66480 [PATCH gnome-team WIP 0/2] Update WebkitGTK reassign 66480 guix-patches submitter 66480 Liliana Marie Prikler severity 66480 normal tag 66480 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 02:53:04 2023 Received: (at submit) by debbugs.gnu.org; 12 Oct 2023 06:53:04 +0000 Received: from localhost ([127.0.0.1]:40477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqpZ9-0006us-64 for submit@debbugs.gnu.org; Thu, 12 Oct 2023 02:53:04 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqpZ3-0006uI-4a for submit@debbugs.gnu.org; Thu, 12 Oct 2023 02:53:01 -0400 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 1qqpYa-00035k-UQ for guix-patches@gnu.org; Thu, 12 Oct 2023 02:52:29 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqpYZ-0004Fb-5v for guix-patches@gnu.org; Thu, 12 Oct 2023 02:52:28 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-4064867903cso7663155e9.2 for ; Wed, 11 Oct 2023 23:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697093545; x=1697698345; darn=gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=kr8Lnclb6waTpeUU54CRXS+pHIdswLMwu58IK5vhSuE=; b=PXDEEwXeBiOZBRPdLVz9m0GytOuPB8RAkweQLIX1YffOl9xceBJDu8Q5nuiicn+zNn cRIPYpK11doK7Erg4mD9Ifop4k2rnPvFCr81+Q0q4X/84eORKEuSt5AsE1aOCBpvl7V+ X/Lj/zT0BoUZvgfzhaFK+z64/EnoFvafmnDOWqNDFoVAL3/QaiZ4QeGo2iA8EfidO2xI u6uN6SuDgL+s7jrtD9IUEMVwSa7spEWeKEjAnO6+ZIxBtoquPfATe7OeWVkjadQTfHh3 XaAij967kQUqVw/CAOBbhGh/SS7lYUaA/nG2v8x587pL0TklGJm9wYexvMLA2AXrpsu+ t2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093545; x=1697698345; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kr8Lnclb6waTpeUU54CRXS+pHIdswLMwu58IK5vhSuE=; b=wWnBoZ6sE6SUMz5bzmpYnWQ57vsHM70lI31fjsQ0HjPK7JeHvGKqxZ5OKCzqQ6XtAl tx5n3tE4sMh6zBoEsvGalXF7IB8uOK1N0dDO1DBZRH0JMUYg5gEUMeQOh2CZBs6IjZkx lPtVn3OejJoFCIBa5MaQBjmwgnOIGERt8uO8mM5uOhfoqYdI2vbKJJS+cC77n7gdAKLW 5EyiNPwNKXHxeg717t2zY2XbandFML0LuYFEcUakOZRAIwqyyV6lgjuwmBQVtlTvyWZ7 90v0Bifzx3i4YCx9W622GmKPu8jyR5ubdeH6qWNpDgLLFE6FMdO4fcsgRkMxbZxScpot ag0Q== X-Gm-Message-State: AOJu0Yz1IpfbiO7YEdfJddoFj1BGbtqxQ2v9wy8wIsWx0kv0LzqU0a3/ x44qj6XiY9tLhrkZ4d4Y7PjAZ3l0nff2cA== X-Google-Smtp-Source: AGHT+IEDMucc3aB8aZ1qghJZXmCouMKRB3gs862ap+VUYppKiT2q6JN0xKfbDwzCvq8EiIUe0oC8lA== X-Received: by 2002:a05:6000:68d:b0:32d:88fd:5c65 with SMTP id bo13-20020a056000068d00b0032d88fd5c65mr3774026wrb.1.1697093545239; Wed, 11 Oct 2023 23:52:25 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d9-20020a5d6dc9000000b00327b5ca093dsm17345941wrz.117.2023.10.11.23.52.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:52:23 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 08:37:49 +0200 Subject: [PATCH gnome-team WIP 0/2] Update WebkitGTK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name to: guix-patches@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=liliana.prikler@gmail.com; helo=mail-wm1-x343.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit 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.0 (/) Hi Guix, our Webkit is a tad bit out of date, so let's at least update it on the gnome-team branch. Also, since we have a Webkit 6.0 typelib now, let's make it the default Webkit for everyone. What could go wrong? (hopefully this won't go like where the CI refused to compute stuff) Liliana Marie Prikler (2): gnu: webkitgtk: Update to 2.42.1. gnu: Make webkitgtk-next the new webkitgtk. gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 24 ++++++++++++------------ gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 32 +++++++++++++++----------------- 13 files changed, 41 insertions(+), 42 deletions(-) base-commit: b701a7018d94aebef6a967ec235c72c1f7cdfe5c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 03:25:22 2023 Received: (at 66480) by debbugs.gnu.org; 12 Oct 2023 07:25:22 +0000 Received: from localhost ([127.0.0.1]:40519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqq4Q-0007x8-1V for submit@debbugs.gnu.org; Thu, 12 Oct 2023 03:25:22 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:52374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqq4M-0007wo-Vs for 66480@debbugs.gnu.org; Thu, 12 Oct 2023 03:25:20 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b27bc8b65eso102861666b.0 for <66480@debbugs.gnu.org>; Thu, 12 Oct 2023 00:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697095491; x=1697700291; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=AfdNVDUt9UTNwxNdqTiGKp5b0QhsY4Rv2PNkdd5U638=; b=dDGaukqSIb2+jvHlvQWAHccIlfMIRy3mZm4+HdcAYEezeR9pKVtAWghXy50XSK1N7h 71d+fNMDBz5+kiDwO5wxioNQ7U4HUXidDlfYPFu+Nkm1XQzHK5deGwkBtJuOOxMWxFs1 jXzMlFbOTzKNVuzRWlUFPTPf7NFVS6lltV8oKUxxBrICiIR3NXpn7Qk7hBEAqpS85FLv suoB3I1hQw/MIPrRm7/x+Jf3IbxRsTGFCSdnaipaavzz0O2Kj6Dxu4KA3B/RBwNmGXZ/ 2LGBwvU5sOXOuPImpTjMw1IBjuJaKtK+WqCQplMOwTq2N0Xtln5ADs9+iJys6qvp6WQX 83MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697095491; x=1697700291; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AfdNVDUt9UTNwxNdqTiGKp5b0QhsY4Rv2PNkdd5U638=; b=f2vNj9mXLTHZzTyAwTd6uB5tWibqJTS2mWVSbzmw9juuTyftG31aZN/N9vbMRPic3B fs/C9tfOph4cARKgHm+62MN/X0mxf8B6BCXuBNJ4t7OFwECesFFmsE5tyJ0/yShpHohB NgUfCIHSXtzjdRTIMkK+4lp8Zn9jf064hhz68i2580RaMC9BeukfpX2/nhpE1wBjK0Yy P89iIKMSf9DTuqifNKXPAG/6fzQWKKoksxbcAblegLcalfar1yZmaWkgt4VpWGYUg8wB keD4R+/f1U2OFzMIjLtNyIUX6+pnkyRdSdlQ/rjr8vfaxfnbvYcqJvl0OAQXukX5Q71S oMbg== X-Gm-Message-State: AOJu0Yw+SFgJFj5zBI1LRtO6Jmkoh4et6tNw3HFLgYN4J+fcCUo+Q6al 7YEgXekxvelnNWlpbPCLMwRoZI3CsX10xg== X-Google-Smtp-Source: AGHT+IFWL1Fr5x6cpju78IGD3tBpwebr8aOfakSwzyAr+DTgwfJjYT861fyKL4cGEsWe9M1n+0Qf3A== X-Received: by 2002:a17:907:1b11:b0:9ae:6ffd:bdf7 with SMTP id mp17-20020a1709071b1100b009ae6ffdbdf7mr25346801ejc.39.1697095490508; Thu, 12 Oct 2023 00:24:50 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a1-20020a1709064a4100b009b65a698c5csm10877181ejv.57.2023.10.12.00.24.49 for <66480@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 00:24:49 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 11 Oct 2023 22:24:37 +0200 Subject: [PATCH gnome-team WIP 1/2] gnu: webkitgtk: Update to 2.42.1. X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name to: 66480@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1. [inputs]: Add libjxl. --- gnu/packages/webkit.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0c82435cde..100875dd52 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ (define-public wpeb [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] X-Debbugs-Envelope-To: 66480 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.1 (/) * gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1. [inputs]: Add libjxl. --- gnu/packages/webkit.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0c82435cde..100875dd52 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version "2.40.5") + (version "2.42.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x")) + (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -249,6 +249,7 @@ (define-public webkitgtk libgcrypt libgudev libjpeg-turbo + libjxl libmanette libnotify libpng -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 03:25:25 2023 Received: (at 66480) by debbugs.gnu.org; 12 Oct 2023 07:25:25 +0000 Received: from localhost ([127.0.0.1]:40521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqq4S-0007xJ-Ca for submit@debbugs.gnu.org; Thu, 12 Oct 2023 03:25:25 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:44220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqq4O-0007wq-5y for 66480@debbugs.gnu.org; Thu, 12 Oct 2023 03:25:21 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-9a6190af24aso106572766b.0 for <66480@debbugs.gnu.org>; Thu, 12 Oct 2023 00:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697095492; x=1697700292; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=VgudLdlg83d9g3AYA1kSI1R/kCHWiMYmQHdcGhwgMzA=; b=cJXzZ6kJGTXUViPr9eI/55gTIvsP25bYfRhRkFzF9OwyCyGuUgQlzcP9VI23pUzc7O XJfJs8Lzd7vX2D7VEHSDFucgQ60TNbCwONAJ7Rh4iY35HcTeJ7YzQ/x5LzXx/7LUiMtS o+UY3kX1yhxeQtY9N60RNjGI+dGWT2YMRRAV+eM2ADQpCXD4MT5TmWL2RmlvHtJ2l+Ro X18ZnOfQulNF9dWCqxWGPv9BoITi3NJVZ9fIhCQl8qBDmqOgpi1eWjT+uJ/2Pqj9t7gP C4pjSnxMsUDPc/Z9+S1hxiiOcT+8jsgIt/oFpoLBFXZkoz6jC3fqTyH8Q2N9lh62vUsk Zbsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697095492; x=1697700292; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VgudLdlg83d9g3AYA1kSI1R/kCHWiMYmQHdcGhwgMzA=; b=uf3LqW9vNjr4oZz4ivH3lTWdRJ4tdXd2izMJpJjPsksnOcFRXIlPM0uiqfIo4Bwltr Or1Hjcy9r6vIUNyfCAWHUuODnaV0yfZ2UYnibIjA+GHqmxiODDDbGRlh9S032aotHasA BFRh2nFkc78ysT6zRRA3fRiXJTByMEPnYs/OuKtEPTX4jnFUH4QbicM2hS4D88vzm1gb QbsbTqXFaKevX+rrf1oiBl/ePvtpQxbZ5vqqjUu6gaqWNtvFtk95m4ZZJ6a7tjHcbIj3 YJg6NkcySsZsrw17sfB2E/3m7icSxyHCUgsoejPt2Q/SVbJ0TlDXeF1KsAZ588EDVaP4 NahA== X-Gm-Message-State: AOJu0YygdGRdBmu96zxqjKrnCrP+Bq+HrnaQF33dL3DSOwLvM4QGtMZ3 LszaNeWBKSpVdMSA951+MBAS8SEvw91YwA== X-Google-Smtp-Source: AGHT+IG0SaNjYHlnAekylfk3jsmPA2IPYahos8ZvQv0fvMzP7G8NbzF8vomIWPXvQpmFHcm+Q5137g== X-Received: by 2002:a17:906:1daa:b0:9ae:5f51:2e4a with SMTP id u10-20020a1709061daa00b009ae5f512e4amr17967899ejh.36.1697095491721; Thu, 12 Oct 2023 00:24:51 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a1-20020a1709064a4100b009b65a698c5csm10877181ejv.57.2023.10.12.00.24.50 for <66480@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 00:24:50 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 08:25:26 +0200 Subject: [PATCH gnome-team WIP 2/2] gnu: Make webkitgtk-next the new webkitgtk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name to: 66480@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 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 (-) As of version 2.42.0, the WebKit 6.0 typelib is considered stable. With GNOME itself moving to GTK4 as time marches on, we should reflect the fact that this is the preferred Webkit for future applications. * gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic… (webkitgtk): … here. Move old value … (webkitgtk-for-gtk3): … here. (webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3. * gnu/packages/geo.scm (gnome-maps): Adjust accordingly. * gnu/packages/gnome.scm (gnome-initial-setup, sushi) (cambalache, devhelp, devhelp-with-libsoup2, evolution-data-server) (evolution-data-server-3.44, lollypop, evolution, gnome-boxes) (geary, komikku): Likewise. * gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise. * gnu/packages/mail.scm (balsa): Likewise. * gnu/packages/mate.scm (atril): Likewise. * gnu/packages/music.scm (ctrlr): Likewise. * gnu/packages/rednotebook.scm (rednotebook): Likewise. * gnu/packages/syndication.scm (gfeeds): Likewise. * gnu/packages/telegram.scm (telegram-desktop): Likewise. * gnu/packages/vnc.scm (remmina): Likewise. * gnu/packages/web-browsers.scm (nyxt): Likewise. --- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 24 ++++++++++++------------ gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 27 ++++++++++++--------------- 13 files changed, 38 insertions(+), 40 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..bbf371a88c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -529,7 +529,7 @@ (define-public gnome-maps libsoup libxml2 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bf853bd588..01d7e75890 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup polkit rest-next upower - webkitgtk-next)) + webkitgtk)) (synopsis "Initial setup wizard for GNOME desktop") (description "This package provides a set-up wizard when a user logs into GNOME for the first time. It typically provides a @@ -1665,7 +1665,7 @@ (define-public sushi libmusicbrainz libxml2 neon - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "File previewer for the GNOME desktop") (description "Sushi is a DBus-activated service that allows applications to preview files on the GNOME desktop.") @@ -3369,7 +3369,7 @@ (define-public cambalache python-pygobject python-lxml webkitgtk - webkitgtk-next)) + webkitgtk)) (native-inputs (list `(,glib "bin") gobject-introspection @@ -6130,7 +6130,7 @@ (define-public devhelp pkg-config)) (inputs (list amtk - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") (description @@ -6143,7 +6143,7 @@ (define-public devhelp-with-libsoup2 (hidden-package (package/inherit devhelp (inputs (modify-inputs (package-inputs devhelp) - (replace "webkitgtk" webkitgtk-with-libsoup2)))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))) (define-public cogl (package @@ -8155,7 +8155,7 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") (description @@ -8182,7 +8182,7 @@ (define-public evolution-data-server-3.44 (modify-inputs (package-inputs evolution-data-server) (replace "gnome-online-accounts" gnome-online-accounts-3.44) (replace "libgweather4" libgweather) - (replace "webkitgtk" webkitgtk-with-libsoup2))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))) (propagated-inputs (modify-inputs (package-propagated-inputs evolution-data-server) (delete "gtk") @@ -11318,7 +11318,7 @@ (define-public lollypop python-pygobject python-pylast totem-pl-parser - webkitgtk)) + webkitgtk-for-gtk3)) (propagated-inputs (list gst-plugins-good ;required to start lollypop gst-plugins-ugly)) ;required for streaming @@ -11787,7 +11787,7 @@ (define-public evolution libsoup nss openldap - webkitgtk + webkitgtk-for-gtk3 ytnef)) (home-page "https://gitlab.gnome.org/GNOME/evolution") (synopsis "Manage your email, contacts and schedule") @@ -12406,7 +12406,7 @@ (define-public gnome-boxes spice-gtk tracker vte - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and @@ -12480,7 +12480,7 @@ (define-public geary libstemmer libunwind sqlite - webkitgtk + webkitgtk-for-gtk3 ytnef)) (native-inputs (list appstream-glib @@ -13179,7 +13179,7 @@ (define-public komikku python-rarfile python-requests python-unidecode - webkitgtk-next)) + webkitgtk)) (native-inputs (list desktop-file-utils gettext-minimal diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fc52af4612..871d418bc2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3350,7 +3350,7 @@ (define-public guile-gi (guix build utils) (ice-9 popen) (ice-9 rdelim)) - #:disallowed-references ,(list gtk+ webkitgtk) + #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3) #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-dotted-circle-from-combining-character @@ -3396,7 +3396,7 @@ (define-public guile-gi (propagated-inputs (list gobject-introspection)) (inputs (list guile-3.0 glib ;; For tests, only relevant when compiling natively - gtk+ webkitgtk)) + gtk+ webkitgtk-for-gtk3)) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -3935,7 +3935,7 @@ (define-public nomad ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") - ("webkitgtk" ,webkitgtk) + ("webkitgtk" ,webkitgtk-for-gtk3) ("gtksourceview" ,gtksourceview-4) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("vte" ,vte) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5ba5c7d519..8cda1d00ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5039,7 +5039,7 @@ (define-public sbcl-cl-webkit (inputs `(("cffi" ,sbcl-cffi) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (native-inputs `(;; Tests seem to need Xorg. ;; ("xorg-server" ,xorg-server-for-tests) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..5e65ded3f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3915,7 +3915,7 @@ (define-public balsa libsecret openldap sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list compface `(,glib "bin") intltool pkg-config yelp-tools)) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5c3b4a265e..5a6c6b5b64 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -775,7 +775,7 @@ (define-public atril ;; Build libkpathsea as a shared library for DVI support. ;; ("libkpathsea" ,texlive-bin) ("poppler" ,poppler) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (home-page "https://mate-desktop.org") (synopsis "Document viewer for Mate") (description diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..f6d418ce81 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -538,7 +538,7 @@ (define-public ctrlr freetype libiberty libx11 - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list pkg-config)) (home-page "https://ctrlr.org/") diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index f63104ad32..a5dcc26efd 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -71,7 +71,8 @@ (define-public rednotebook `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) #t)))))) (inputs - (list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk)) + (list gtk+ gtksourceview-3 python-pyyaml python-pygobject + webkitgtk-for-gtk3)) ;; TODO: package the following for python3 (if possible), add them as ;; dependencies, and remove them from rednotebook source: ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ac00d396b5..ea42c579cb 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -622,7 +622,7 @@ (define-public gfeeds python-readability-lxml python-requests syndication-domination - webkitgtk-next)) + webkitgtk)) (home-page "https://gfeeds.gabmus.org/") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (description "Feeds is an RSS/Atom feed reader made with GTK+ diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d3276cbe7c..af90fc35eb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -531,7 +531,7 @@ (define-public telegram-desktop rnnoise wayland wayland-protocols - webkitgtk + webkitgtk-for-gtk3 webrtc-for-telegram-desktop xcb-util-keysyms xxhash diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 8ba1292e28..7b39aba58d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -151,7 +151,7 @@ (define-public remmina telepathy-glib vte ; for st plugin wayland - webkitgtk ; for www plugin + webkitgtk-for-gtk3 ; for www plugin libx11 libxext ; for xdmcp plugin xdg-utils diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d0b4e9f971..b5a29647bb 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -711,7 +711,7 @@ (define-public nyxt gsettings-desktop-schemas cl-gobject-introspection gtk+ ; For the main loop - webkitgtk ; Required when we use its typelib + webkitgtk-for-gtk3 ; Required when we use its typelib gobject-introspection pkg-config)) (synopsis "Extensible web-browser in Common Lisp") diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 100875dd52..a374711119 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,7 +126,7 @@ (define-public wpebackend-fdo (define-public webkitgtk (package - (name "webkitgtk") ; webkit2gtk4 + (name "webkitgtk") (version "2.42.1") (source (origin (method url-fetch) @@ -149,10 +149,8 @@ (define-public webkitgtk #:build-type "Release" #:configure-flags #~(list "-DPORT=GTK" - ;; GTKDOC will be removed upstream soon in favor of - ;; gi-docgen; it is normally disabled because the - ;; doc is rather expensive to build. - "-DENABLE_GTKDOC=ON" + "-DENABLE_INTROSPECTION=ON" + "-DUSE_GTK4=ON" ;; The minibrowser, not built by default, is a good ;; tool to validate the good operation of ;; webkitgtk. @@ -232,7 +230,7 @@ (define-public webkitgtk ruby-2.7 unifdef)) (propagated-inputs - (list gtk+ libsoup)) + (list gtk libsoup)) (inputs (list at-spi2-core bubblewrap @@ -251,7 +249,6 @@ (define-public webkitgtk libjpeg-turbo libjxl libmanette - libnotify libpng libseccomp libsecret @@ -284,28 +281,28 @@ (define-public webkitgtk license:bsd-2 license:bsd-3)))) -(define-public webkitgtk-next +(define-public webkitgtk-for-gtk3 (package (inherit webkitgtk) - (name "webkitgtk-next") ; webkit2gtk5 + (name "webkitgtk-for-gtk3") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) - #~(cons* "-DENABLE_INTROSPECTION=ON" - "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))))) + #~(cons* "-DENABLE_GTKDOC=ON" + (delete "-DENABLE_INTROSPECTION=ON" + (delete "-DUSE_GTK4=ON" #$flags)))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) - (replace "gtk+" gtk))) + (replace "gtk" gtk+))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "libnotify"))))) + (prepend libnotify))))) ;;; 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 + (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 10:30:20 2023 Received: (at 66480) by debbugs.gnu.org; 12 Oct 2023 14:30:20 +0000 Received: from localhost ([127.0.0.1]:43999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqwhg-0004YK-2p for submit@debbugs.gnu.org; Thu, 12 Oct 2023 10:30:20 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:47304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqwhd-0004V1-8j for 66480@debbugs.gnu.org; Thu, 12 Oct 2023 10:30:18 -0400 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-41810cfc569so6600861cf.2 for <66480@debbugs.gnu.org>; Thu, 12 Oct 2023 07:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697120989; x=1697725789; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=TOsTKKwkHxszyfbYoAW2hbob8O/q88Xr54uS2D753h8=; b=PZ/4i9DUsRJLULqdrdVd8/rRVK76Sj/eIXLCfP9Bgxqk/yJaAdzwghv1xF276c6PTQ YzGcwJbtLUcQeHdEJwqTMK7yAo0BgjEkhpFpw7jGaPsV5wj3/ilIMP8LG+mj3zCJZrfu T6/Dobh028p3TK4oRkGNyWjsOs2utkEVqAVmgAgHgpafKdgu7xV6rTgiljnUwrqGBap1 Yv0k1k7fKfoxq2RIJzsUVyK9U2kxYkgccvtl2vynsiB7h30W51rmTtT5oGpuDEt1otmL LpEqRScfC6dx92d/cBA8wr2QxlN/P1DtpIcDup1I/2ZNWp/y0ofaxPcMIXNujUpzl45u 9tmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697120989; x=1697725789; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TOsTKKwkHxszyfbYoAW2hbob8O/q88Xr54uS2D753h8=; b=Ksc1wvGVJt1bBylnKt6CkVw3g4qzSmjRV4RJfcaHKpTM6eoM20yNwB8CTlDvGF+wGn TwUGLWWiL6evyfZbmlLmXeWoMqai8MPNF7xbow/C0v0PMBYjG/N6ZzsQGVtPdyVe+NRT lS4JrKVNrS91Ie58dS0+YyhNDveGGFuoe8t2SOgfL9WL1v7PnpdW55ic99CJK67OHqOR gej6in1N0ZahkOe+BwY7jE5GILjbPAh78dNc0g78WDblnz3BJiMkV1L6/JTBr6RKcBPx AHtjGIZRagnhbKuBiMzADlS9eTRfALUYA+d0CUqiFmeXjo/MrIuglKBz/87Vl+ulnzX4 wBbw== X-Gm-Message-State: AOJu0YwKEIBt+ePM2eBPb9REC9HPXmTTneL+TDiW7ni+hxE8YNr5c/+V qfMRFpj862oz+mtDHrR9m9Q= X-Google-Smtp-Source: AGHT+IH0xvjpq2f7D+f+dih6RKeBjXYe/G1fUXYYPSIXnaeATrWql8PwQK+dMH4HjZc5TfpMaeIMdA== X-Received: by 2002:a05:622a:1306:b0:417:b901:91a7 with SMTP id v6-20020a05622a130600b00417b90191a7mr31650389qtk.24.1697120989109; Thu, 12 Oct 2023 07:29:49 -0700 (PDT) Received: from hurd (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id x27-20020ac84d5b000000b004109928c607sm6229304qtv.43.2023.10.12.07.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 07:29:48 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK In-Reply-To: (Liliana Marie Prikler's message of "Thu, 12 Oct 2023 08:37:49 +0200") References: Date: Thu, 12 Oct 2023 10:29:47 -0400 Message-ID: <87r0lzap7o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 (-) Hello, Liliana Marie Prikler writes: > Hi Guix, > > our Webkit is a tad bit out of date, so let's at least update it on the > gnome-team branch. Also, since we have a Webkit 6.0 typelib now, let's > make it the default Webkit for everyone. What could go wrong? > > (hopefully this won't go like where > the CI refused to compute stuff) > > Liliana Marie Prikler (2): > gnu: webkitgtk: Update to 2.42.1. > gnu: Make webkitgtk-next the new webkitgtk. I'm not too sure what Webkit 'typelib' means, but at any rate this looks reasonable to me (series LGTM). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 12:38:11 2023 Received: (at 66480) by debbugs.gnu.org; 12 Oct 2023 16:38:12 +0000 Received: from localhost ([127.0.0.1]:44194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqyhP-0003MW-FQ for submit@debbugs.gnu.org; Thu, 12 Oct 2023 12:38:11 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqyhJ-0003Ly-Tr for 66480@debbugs.gnu.org; Thu, 12 Oct 2023 12:38:09 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-405361bba99so11858355e9.2 for <66480@debbugs.gnu.org>; Thu, 12 Oct 2023 09:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697128657; x=1697733457; darn=debbugs.gnu.org; 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=2zWhRZNzwVAS7TVZjIYeshU+hYsICem/TYK1ANcmM4A=; b=ekESAXKp3n/WRR21DWi204ATMcJz9Cc8VvswLrd2QQd+aBmKvDs8I+C5BdtTQ6PL5/ 34wLdyNJ3gTJSC+LceVsHTJ9qedkeZLMiKVPo0MPbNKJi6ViqEKBliAi1dQM0xsXz+Is cy47fn/7fKPNeaAwnQwn6WHhg0VTjoBfg64IKoBFEeF6EaUu7BjUnPfW9E0dX8saxkJg Cen9cfSr40Ewi2UWrTpENfJK5MQKlnU7+7PYLgv4rHGY1Jt4sn3O7vmVeUBEamIrUz9r u7A7H0YNNMyT5GIEBTCTf+h80Cg3zj9qgL9bbJ/iP3O4cw3cXFmxIskBS+jPb9Hg3Eer yMYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697128657; x=1697733457; 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=2zWhRZNzwVAS7TVZjIYeshU+hYsICem/TYK1ANcmM4A=; b=j6GcGKweRTYD7puKoZ0IT+YpDAGuI70ibHmIKKI+o0hqer4FatiqInRmitf42LUIqU vCku1pBPCoFAa8Lotq+wgGAsfUcAT8eFZSKC8hLTe3t7wZcRGKHoJ/mdm71IcgkE+g1c 0roOAJbQhpLN1IkG9uXqPC7ceKz8jLIWkOdqQ2CnCMh3aEBxsGKlWaFxQ8pGKyddZyTY 37Sa+IDyzA/KcguPmiSfvUcEuUe8k83/SksssrBW1ITumwshAOGYklQOkCVtiW159mRh LjZxF0Z64qDPrBt5QDWNjLrwABUik1O5sc5JPEzWjBtiJ1ZhPAXRyWcdbbP82cpeica1 27yw== X-Gm-Message-State: AOJu0YzRlg2k6fofdaHv3Yv8QYju6WnzqW77f05iAHVKhzytIHDcymst YM2FgAgBUtojczpHsMISrnw= X-Google-Smtp-Source: AGHT+IEUXuzYNy3G1z4WsiUo0UtcHJLJpYOBNAeAnrQQAqpQN7920rOzxMnXG+C7OexY4YaPkGxU9w== X-Received: by 2002:a05:600c:3790:b0:402:cc9a:31a7 with SMTP id o16-20020a05600c379000b00402cc9a31a7mr21489093wmr.19.1697128657352; Thu, 12 Oct 2023 09:37:37 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id m16-20020a7bca50000000b003fee6e170f9sm253215wml.45.2023.10.12.09.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 09:37:35 -0700 (PDT) Message-ID: <3105c9b96e6ac9161dd88b621903c537f3794da4.camel@gmail.com> Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK From: Liliana Marie Prikler To: Maxim Cournoyer Date: Thu, 12 Oct 2023 18:37:32 +0200 In-Reply-To: <87r0lzap7o.fsf@gmail.com> References: <87r0lzap7o.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 Donnerstag, dem 12.10.2023 um 10:29 -0400 schrieb Maxim Cournoyer: > Hello, >=20 > Liliana Marie Prikler writes: >=20 > > Hi Guix, > >=20 > > our Webkit is a tad bit out of date, so let's at least update it on > > the gnome-team branch.=C2=A0 Also, since we have a Webkit 6.0 typelib > > now, let's make it the default Webkit for everyone.=C2=A0 What could go > > wrong? > >=20 > > (hopefully this won't go like > > where=C2=A0the CI refused to compute stuff) > >=20 > > Liliana Marie Prikler (2): > > =C2=A0 gnu: webkitgtk: Update to 2.42.1. > > =C2=A0 gnu: Make webkitgtk-next the new webkitgtk. >=20 > I'm not too sure what Webkit 'typelib' means, but at any rate this > looks reasonable to me (series LGTM). Put shortly, typelibs are annotated "C" libraries that you can use from many languages by consuming XML or reading a particularly formatted binary file. (See also gobject-introspection.) Basically, the move to Webkit 6.0 means that the GTK4 port of Webkit is now considered stable (6.0 means GTK, 5.x was GTK4 before, 4.1 is libsoup3, and 4.0 is libsoup2). Apparently, you can't really version- bump your dependencies without version-bumping your typelib so that downstream doesn't suddenly get hit by some API instability. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 23:38:15 2023 Received: (at 66480) by debbugs.gnu.org; 13 Oct 2023 03:38:15 +0000 Received: from localhost ([127.0.0.1]:44541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qr90B-0007yv-Fx for submit@debbugs.gnu.org; Thu, 12 Oct 2023 23:38:15 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:60843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qr908-0007yh-FX for 66480@debbugs.gnu.org; Thu, 12 Oct 2023 23:38:14 -0400 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-777252c397cso113971885a.1 for <66480@debbugs.gnu.org>; Thu, 12 Oct 2023 20:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697168264; x=1697773064; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YE5RTtJ4Cc1LV2NYZ00rAtoZgISpBOMCGmiMZb7HFE8=; b=iuOSF0KMHWlz6CxgiXlCzvDVzVe6PJD079JfHatKlp/wHBK8mVfBg0xEMMoCIXCiPe CNnEjclMxPNl80qM0VPWeIRf8+Qhq7zYcoF7tQe//RIH6trjCRNhCUmaJK8xYXWu+fxr XfgaEtuEqiCG125r35wWFDJuDSF0Gr7eQRmgnjyY84hDtlySj9sW+9s7VtxSHFNMtPK7 FTSrxLzw0D5/Veo0gzQWR4Q9uEhCL6/I8isD/8EI78SNTi66m3Bi5i6ST0vO+iRgyun2 Dh0vyxHp9Az/SrOqwQprDN52VkMU75H8NCfzSFRn/CLJ5JscZIYDVzAlILbB8tI8d+1O 7Tfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697168264; x=1697773064; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YE5RTtJ4Cc1LV2NYZ00rAtoZgISpBOMCGmiMZb7HFE8=; b=XwYMZe9Yh8d9fNcgfAXZRO3RBdmJIYwKCQsCJTdEVAEUT/IO5B3lTjZOmQ/w6JPKgs hgPKSa9kBAm8Y5k3bhjJ1Veuv0ZhSX7qjNmy5RJzUX8qbawW6Z2YCjF4AatGVCbXgfXd uGHi245P60mSqnsp9sts5cQm0RAP6cy5C+DwvZ3EVkE0NvQe10+D9udnk2LaAQsEJpiM H/kpCLy3hurZUHE4vhXl1rLApKw8Pyy6nzKjOGBtaSnr02w8h5CdCbLL4tgRmBFp3qoK f7eawJwoWeM92dMpw4Rwns9Wt6fXpkHuq+KR/qILgqZ54TFAKnpstvXSBoIdyG9xsDEj VMyg== X-Gm-Message-State: AOJu0Yyl/f2+x6DALoV/pAUqqoYBVcrtz9gHnZRFbgQTX15BwwU8Bkux 22b5p7EH8eX6QSiG5PTFaBm3iEEwTvCHNQ== X-Google-Smtp-Source: AGHT+IG+ppagXqF8m37RHn/k4zMKiFIwHBMEM/dzY7/j6T1MhXjftW8jQL3rycDIBQjdrQ/NrHbxRQ== X-Received: by 2002:a05:620a:1a24:b0:774:13e:71cd with SMTP id bk36-20020a05620a1a2400b00774013e71cdmr31547084qkb.56.1697168264098; Thu, 12 Oct 2023 20:37:44 -0700 (PDT) Received: from hurd (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id m18-20020ae9f212000000b0076cdc3b5beasm298408qkg.86.2023.10.12.20.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 20:37:43 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK In-Reply-To: <3105c9b96e6ac9161dd88b621903c537f3794da4.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 12 Oct 2023 18:37:32 +0200") References: <87r0lzap7o.fsf@gmail.com> <3105c9b96e6ac9161dd88b621903c537f3794da4.camel@gmail.com> Date: Thu, 12 Oct 2023 23:37:42 -0400 Message-ID: <87a5sn6vll.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 (-) Hi, Liliana Marie Prikler writes: > Am Donnerstag, dem 12.10.2023 um 10:29 -0400 schrieb Maxim Cournoyer: >> Hello, >>=20 >> Liliana Marie Prikler writes: >>=20 >> > Hi Guix, >> >=20 >> > our Webkit is a tad bit out of date, so let's at least update it on >> > the gnome-team branch.=C2=A0 Also, since we have a Webkit 6.0 typelib >> > now, let's make it the default Webkit for everyone.=C2=A0 What could go >> > wrong? >> >=20 >> > (hopefully this won't go like >> > where=C2=A0the CI refused to compute stuff) >> >=20 >> > Liliana Marie Prikler (2): >> > =C2=A0 gnu: webkitgtk: Update to 2.42.1. >> > =C2=A0 gnu: Make webkitgtk-next the new webkitgtk. >>=20 >> I'm not too sure what Webkit 'typelib' means, but at any rate this >> looks reasonable to me (series LGTM). > Put shortly, typelibs are annotated "C" libraries that you can use from > many languages by consuming XML or reading a particularly formatted > binary file. (See also gobject-introspection.) > > Basically, the move to Webkit 6.0 means that the GTK4 port of Webkit is > now considered stable (6.0 means GTK, 5.x was GTK4 before, 4.1 is > libsoup3, and 4.0 is libsoup2). Apparently, you can't really version- > bump your dependencies without version-bumping your typelib so that > downstream doesn't suddenly get hit by some API instability. I see! Thanks for explaining. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 13 14:48:50 2023 Received: (at 66480) by debbugs.gnu.org; 13 Oct 2023 18:48:50 +0000 Received: from localhost ([127.0.0.1]:47457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrNDN-0001yz-CA for submit@debbugs.gnu.org; Fri, 13 Oct 2023 14:48:49 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:44053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrNDI-0001xY-VA for 66480@debbugs.gnu.org; Fri, 13 Oct 2023 14:48:45 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-40776b20031so3849725e9.0 for <66480@debbugs.gnu.org>; Fri, 13 Oct 2023 11:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697222896; x=1697827696; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=rTwiD3GviWeAZsjbo6RThMBT7sydeiPdfBoHRZNC8t4=; b=Ee0IiXHM/b6uDVUGCNClEx+2piE3B/iavdo4OvmJMLQ2VMMNU29GuNRqFNN9asH5+6 S1xyVZSll3RPJfx5ZsERFyeAYdg4HoZmadiCxIhyA9nfCiRxuOQUW8J+shIZdo48ZuJv N4lTFXzowlHSVgIl4CoK3799/UkMCReaOFR+wI6dPktscPP49+H+eUgwlTB7HC40hYLR crq0W5MsfSRFIUAnfUohoHaS6LKqiBWoIu89xiU9Q0IDiBWnf2DhJj4oPVRa1p/cleY9 uTJjW9F3Hmr8kgrKMZdh493v184R5cwB/yY4oGrRS8tw0J8StzmFbvd1ENpsazSbbPnB StTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697222896; x=1697827696; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rTwiD3GviWeAZsjbo6RThMBT7sydeiPdfBoHRZNC8t4=; b=OyHhJy97AGcR6drAxMwiiuO/YYHW2r59/RMaqMe2NijjgM3dgbMrdx6h8oRbUQufwJ wwZjnVsRfB7a55HAfKecyt+M6J4zKrcwgRKuqvpGol5EDYMXiuX54p65ZSaT1Xw5CqTL PjhcfIbPEx6eRQ6+1r5Ur4hmSTYlNoTSESHJmM1IElgwSKG0V55G4kKxGKeHUmw+ouBb RmcTg20DqJcJzqcKmG0RF1Ne3JJ/TUX0U6VJ4b8OqIIMpE9Xhfc9fkakMygPjQP6uaqM NGU/ofAyCYCBpG1fhd1ZPnf715m2YF4Y0s7n/ipFwV+UKOr3o8/lFxc+Km/WgtbT1Kse QZhg== X-Gm-Message-State: AOJu0Yx9pN/c3defu8EhJQB6C5q183UIr/v9S2ATZTqAP10m6RMq0GpR zePElAmF1D4NcjpBrLkP4d7dLq5TxJx/fw== X-Google-Smtp-Source: AGHT+IE3d2/g/q7aAsC2EqV8GCFnekf/tuJ5AIq+GHUcOTCHMzgnhHMGkb1IHiIHF9KRGCM0RVBA2A== X-Received: by 2002:a05:600c:1d22:b0:407:4993:984c with SMTP id l34-20020a05600c1d2200b004074993984cmr13936154wms.30.1697222895896; Fri, 13 Oct 2023 11:48:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n28-20020a05600c3b9c00b0040772934b12sm878997wms.7.2023.10.13.11.48.14 for <66480@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 11:48:14 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Wed, 11 Oct 2023 22:24:37 +0200 Subject: [PATCH gnome-team v2 1/2] gnu: webkitgtk: Update to 2.42.1. X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name to: 66480@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66480 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 (webkitgtk): Update to 2.42.1. [inputs]: Add libjxl. --- gnu/packages/webkit.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0c82435cde..100875dd52 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version "2.40.5") + (version "2.42.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x")) + (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -249,6 +249,7 @@ (define-public webkitgtk libgcrypt libgudev libjpeg-turbo + libjxl libmanette libnotify libpng base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf prerequisite-patch-id: 200a55f018acd42885dcb3cd10ec7b17524d8dd4 prerequisite-patch-id: dfca7d9abc3417513768cc76f3ed499dc255ae93 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 13 14:48:52 2023 Received: (at 66480) by debbugs.gnu.org; 13 Oct 2023 18:48:53 +0000 Received: from localhost ([127.0.0.1]:47461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrNDO-0001zE-Mz for submit@debbugs.gnu.org; Fri, 13 Oct 2023 14:48:52 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:58438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrNDK-0001xi-1i for 66480@debbugs.gnu.org; Fri, 13 Oct 2023 14:48:47 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so27841565e9.0 for <66480@debbugs.gnu.org>; Fri, 13 Oct 2023 11:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697222897; x=1697827697; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Zteq23JDIeT6+6PwSzSODSKvyuGIgotIkuayP+V8cnA=; b=Xx8UXFR3F0XAeOpe9fgTpuABoTW/ZNTjtltjRVp/rlSMxvzlD8ZG1D1iU7Ldb1JOBr lWSeudGpggaqs8p+0VZrkt6Nn8LGWnlqxX7sNf6B6mu2HMpFtvYcwljBDFoG0yeXaOFg 8Pcp39Zi+/c3Z5NpOcvwy1XYzhm2yKfEVnO+ZJeVWj8UvVSpfvmJavIJTtkhxn+Vubjh OFpxe8I1T4tHgMojpHUR3dWO3EXoECQgcqmpugLGS7lLxunJetA/5b1TLLG3UQt6WZ+/ M8XGIvcm5Do5DDyJCn4ftBdLfiNFXW1tB2FTPwkbhJ16oAVuAVpohZhWb6EJh0CtHQqU Q0Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697222897; x=1697827697; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zteq23JDIeT6+6PwSzSODSKvyuGIgotIkuayP+V8cnA=; b=EBDMhVAbsurXaXITmhfU4sQWCZisKJx21h21cVhufBK/Dl5rn6QJkpBlnryoUF2fKU 0WSJw1YZef+ncyBBlnUXCoaXzHFjjii/ySACGunB/lPkTxv3/zE4AzbdOeM0Yjx75OpA Uoo7thrW37IqItJqMieytaraJuHDb3hNDt9xwQdRKLAqQP2hgDzTc5vHUZoXxCcL3Eqo +Ggoct5ZQvDkpsrAjsKx+AxLMC32kP43n7H6kM3EkLmGDv+jfsjIX1ZifRvxmsUXYopp vrDlSYqNxDZxa1AsiD0KquI5vZTJ6ooUhXnVCydrjs4ZzkwWot3G+MJxv5khllO3awbA Q6+Q== X-Gm-Message-State: AOJu0YyWu5GYdsr21O5SciysW9tsh5Oy7z4qg5RYHDcaveO4iVwGLrkN JUDG2xtck3H1vIFeUtX4koa2UIvUtwy/fg== X-Google-Smtp-Source: AGHT+IGeaGh7M7P3FAdP6Vw34Uh693zZGNOQrtQQlCp5sP1P8uUWBZ3Z6ZbLbG21TV3/O+61zZaR5w== X-Received: by 2002:a7b:c851:0:b0:406:5301:4320 with SMTP id c17-20020a7bc851000000b0040653014320mr24808338wml.16.1697222897014; Fri, 13 Oct 2023 11:48:17 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n28-20020a05600c3b9c00b0040772934b12sm878997wms.7.2023.10.13.11.48.15 for <66480@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 11:48:16 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 08:25:26 +0200 Subject: [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name to: 66480@debbugs.gnu.org X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66480 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 (/) As of version 2.42.0, the WebKit 6.0 typelib is considered stable. With GNOME itself moving to GTK4 as time marches on, we should reflect the fact that this is the preferred Webkit for future applications. * gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic… (webkitgtk): … here. Move old value … (webkitgtk-for-gtk3): … here. (webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3. * gnu/packages/geo.scm (gnome-maps): Adjust accordingly. * gnu/packages/gnome.scm (gnome-initial-setup, sushi) (cambalache, devhelp, devhelp-with-libsoup2, evolution-data-server) (evolution-data-server-3.44, lollypop, evolution, gnome-boxes) (geary, komikku): Likewise. * gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise. * gnu/packages/mail.scm (balsa): Likewise. * gnu/packages/mate.scm (atril): Likewise. * gnu/packages/music.scm (ctrlr): Likewise. * gnu/packages/rednotebook.scm (rednotebook): Likewise. * gnu/packages/syndication.scm (gfeeds): Likewise. * gnu/packages/telegram.scm (telegram-desktop): Likewise. * gnu/packages/vnc.scm (remmina): Likewise. * gnu/packages/web-browsers.scm (nyxt): Likewise. --- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 24 ++++++++++++------------ gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 27 ++++++++++++--------------- 13 files changed, 38 insertions(+), 40 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..bbf371a88c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -529,7 +529,7 @@ (define-public gnome-maps libsoup libxml2 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc2a6b24bd..c61fbcc295 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup polkit rest-next upower - webkitgtk-next)) + webkitgtk)) (synopsis "Initial setup wizard for GNOME desktop") (description "This package provides a set-up wizard when a user logs into GNOME for the first time. It typically provides a @@ -1665,7 +1665,7 @@ (define-public sushi libmusicbrainz libxml2 neon - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "File previewer for the GNOME desktop") (description "Sushi is a DBus-activated service that allows applications to preview files on the GNOME desktop.") @@ -3369,7 +3369,7 @@ (define-public cambalache python-pygobject python-lxml webkitgtk - webkitgtk-next)) + webkitgtk)) (native-inputs (list `(,glib "bin") gobject-introspection @@ -6130,7 +6130,7 @@ (define-public devhelp pkg-config)) (inputs (list amtk - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") (description @@ -6143,7 +6143,7 @@ (define-public devhelp-with-libsoup2 (hidden-package (package/inherit devhelp (inputs (modify-inputs (package-inputs devhelp) - (replace "webkitgtk" webkitgtk-with-libsoup2)))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))) (define-public cogl (package @@ -8155,7 +8155,7 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") (description @@ -8182,7 +8182,7 @@ (define-public evolution-data-server-3.44 (modify-inputs (package-inputs evolution-data-server) (replace "gnome-online-accounts" gnome-online-accounts-3.44) (replace "libgweather4" libgweather) - (replace "webkitgtk" webkitgtk-with-libsoup2))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))) (propagated-inputs (modify-inputs (package-propagated-inputs evolution-data-server) (delete "gtk") @@ -11315,7 +11315,7 @@ (define-public lollypop python-pygobject python-pylast totem-pl-parser - webkitgtk)) + webkitgtk-for-gtk3)) (propagated-inputs (list gst-plugins-good ;required to start lollypop gst-plugins-ugly)) ;required for streaming @@ -11784,7 +11784,7 @@ (define-public evolution libsoup nss openldap - webkitgtk + webkitgtk-for-gtk3 ytnef)) (home-page "https://gitlab.gnome.org/GNOME/evolution") (synopsis "Manage your email, contacts and schedule") @@ -12400,7 +12400,7 @@ (define-public gnome-boxes spice-gtk tracker vte - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and @@ -12474,7 +12474,7 @@ (define-public geary libstemmer libunwind sqlite - webkitgtk + webkitgtk-for-gtk3 ytnef)) (native-inputs (list appstream-glib @@ -13173,7 +13173,7 @@ (define-public komikku python-rarfile python-requests python-unidecode - webkitgtk-next)) + webkitgtk)) (native-inputs (list desktop-file-utils gettext-minimal diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fc52af4612..871d418bc2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3350,7 +3350,7 @@ (define-public guile-gi (guix build utils) (ice-9 popen) (ice-9 rdelim)) - #:disallowed-references ,(list gtk+ webkitgtk) + #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3) #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-dotted-circle-from-combining-character @@ -3396,7 +3396,7 @@ (define-public guile-gi (propagated-inputs (list gobject-introspection)) (inputs (list guile-3.0 glib ;; For tests, only relevant when compiling natively - gtk+ webkitgtk)) + gtk+ webkitgtk-for-gtk3)) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -3935,7 +3935,7 @@ (define-public nomad ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") - ("webkitgtk" ,webkitgtk) + ("webkitgtk" ,webkitgtk-for-gtk3) ("gtksourceview" ,gtksourceview-4) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("vte" ,vte) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5ba5c7d519..8cda1d00ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5039,7 +5039,7 @@ (define-public sbcl-cl-webkit (inputs `(("cffi" ,sbcl-cffi) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (native-inputs `(;; Tests seem to need Xorg. ;; ("xorg-server" ,xorg-server-for-tests) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..5e65ded3f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3915,7 +3915,7 @@ (define-public balsa libsecret openldap sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list compface `(,glib "bin") intltool pkg-config yelp-tools)) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5c3b4a265e..5a6c6b5b64 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -775,7 +775,7 @@ (define-public atril ;; Build libkpathsea as a shared library for DVI support. ;; ("libkpathsea" ,texlive-bin) ("poppler" ,poppler) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (home-page "https://mate-desktop.org") (synopsis "Document viewer for Mate") (description diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..f6d418ce81 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -538,7 +538,7 @@ (define-public ctrlr freetype libiberty libx11 - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list pkg-config)) (home-page "https://ctrlr.org/") diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index f63104ad32..a5dcc26efd 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -71,7 +71,8 @@ (define-public rednotebook `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) #t)))))) (inputs - (list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk)) + (list gtk+ gtksourceview-3 python-pyyaml python-pygobject + webkitgtk-for-gtk3)) ;; TODO: package the following for python3 (if possible), add them as ;; dependencies, and remove them from rednotebook source: ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ac00d396b5..ea42c579cb 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -622,7 +622,7 @@ (define-public gfeeds python-readability-lxml python-requests syndication-domination - webkitgtk-next)) + webkitgtk)) (home-page "https://gfeeds.gabmus.org/") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (description "Feeds is an RSS/Atom feed reader made with GTK+ diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d3276cbe7c..af90fc35eb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -531,7 +531,7 @@ (define-public telegram-desktop rnnoise wayland wayland-protocols - webkitgtk + webkitgtk-for-gtk3 webrtc-for-telegram-desktop xcb-util-keysyms xxhash diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 8ba1292e28..7b39aba58d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -151,7 +151,7 @@ (define-public remmina telepathy-glib vte ; for st plugin wayland - webkitgtk ; for www plugin + webkitgtk-for-gtk3 ; for www plugin libx11 libxext ; for xdmcp plugin xdg-utils diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d0b4e9f971..b5a29647bb 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -711,7 +711,7 @@ (define-public nyxt gsettings-desktop-schemas cl-gobject-introspection gtk+ ; For the main loop - webkitgtk ; Required when we use its typelib + webkitgtk-for-gtk3 ; Required when we use its typelib gobject-introspection pkg-config)) (synopsis "Extensible web-browser in Common Lisp") diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 100875dd52..a374711119 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,7 +126,7 @@ (define-public wpebackend-fdo (define-public webkitgtk (package - (name "webkitgtk") ; webkit2gtk4 + (name "webkitgtk") (version "2.42.1") (source (origin (method url-fetch) @@ -149,10 +149,8 @@ (define-public webkitgtk #:build-type "Release" #:configure-flags #~(list "-DPORT=GTK" - ;; GTKDOC will be removed upstream soon in favor of - ;; gi-docgen; it is normally disabled because the - ;; doc is rather expensive to build. - "-DENABLE_GTKDOC=ON" + "-DENABLE_INTROSPECTION=ON" + "-DUSE_GTK4=ON" ;; The minibrowser, not built by default, is a good ;; tool to validate the good operation of ;; webkitgtk. @@ -232,7 +230,7 @@ (define-public webkitgtk ruby-2.7 unifdef)) (propagated-inputs - (list gtk+ libsoup)) + (list gtk libsoup)) (inputs (list at-spi2-core bubblewrap @@ -251,7 +249,6 @@ (define-public webkitgtk libjpeg-turbo libjxl libmanette - libnotify libpng libseccomp libsecret @@ -284,28 +281,28 @@ (define-public webkitgtk license:bsd-2 license:bsd-3)))) -(define-public webkitgtk-next +(define-public webkitgtk-for-gtk3 (package (inherit webkitgtk) - (name "webkitgtk-next") ; webkit2gtk5 + (name "webkitgtk-for-gtk3") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) - #~(cons* "-DENABLE_INTROSPECTION=ON" - "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))))) + #~(cons* "-DENABLE_GTKDOC=ON" + (delete "-DENABLE_INTROSPECTION=ON" + (delete "-DUSE_GTK4=ON" #$flags)))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) - (replace "gtk+" gtk))) + (replace "gtk" gtk+))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "libnotify"))))) + (prepend libnotify))))) ;;; 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 + (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 09:09:30 2023 Received: (at 66480) by debbugs.gnu.org; 14 Oct 2023 13:09:30 +0000 Received: from localhost ([127.0.0.1]:48154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qreOX-0007o4-VA for submit@debbugs.gnu.org; Sat, 14 Oct 2023 09:09:30 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:56679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qreOW-0007nd-Mo for 66480@debbugs.gnu.org; Sat, 14 Oct 2023 09:09:29 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-66d12b3b479so18574956d6.1 for <66480@debbugs.gnu.org>; Sat, 14 Oct 2023 06:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697288939; x=1697893739; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ih54Lv7G/QHKlDphTZjGtROPj/kLFGKeypmTcKfKOBg=; b=IQYhL9COnnnoVSqvmCJc4/8oZWeChpsBZAn1Urho1mTbYizkYL8McjG/cWkeJVA9jB hnUFophcKehFghf1L39Ugnfas9aGTQQ9eQr189krFBWJqw3E1GsbGDc06YmKGeRCGIUJ 5b8Tx/GQbuDnommTP47EuN+L9o51G6m7F+2DMgV6VeiDTef0cOBpmkdjfa46lVRqYZS5 2CNSwCtR8DVrIzEuArdAybSO5Lq4hz7Qq58VKto+cwa8Yu0DgBUwTgL9ZRKwW74zpgxO UgvYZ3zDyaNqYLXfuLL0IFgkUs4u9kvQ7ZNY4YzhgovI0WAN7FzAwlGmxbY7vuTVCYq/ ilag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697288939; x=1697893739; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ih54Lv7G/QHKlDphTZjGtROPj/kLFGKeypmTcKfKOBg=; b=FU34LxHJslAl9rVXp9sw0BbxhXB8eAzBQxR0W6Ld/DNBBTAHMkeQ+xOk834+EuquQD VvqdNUxF26pQh57pglTVnmfx3gbCj+XTCam1utd34ik0ZET+CYRGQ6g1C7Vf2/gqaFyD PDQOwkxmLb20E/fD6FZWnicYp4dGJgf49KhopGXeyjLF2VE8nWcjbgNx3Tqo+ouoqN2l jD1eUw8S+n0IS6MntSoOd3Von/9RFuL5vlyV0KtPrVY5WdnIscyDhnNaB450+W+qlUx5 XhqgjO+3GNhWdEqvNpKB3Smqs+DnZnxcHKpOn1YVZZYjEIhfFIGU/ZZU3C3b8p5WDExx 9Vkg== X-Gm-Message-State: AOJu0YyRgG+mH4BBOEYJuhpa1bmTVJbLrXypix7TIpEPLxMkxzcufleG Hfjnc9xsLLWlNgASgRBQ4U3V53rQzi4= X-Google-Smtp-Source: AGHT+IHN+Ws0hQ/IA4Ces3X2gVNrXvn+0DyHroUAh12jKt/uNo2tPe4OiSIIa3hXpCejHRK3Fqw0FA== X-Received: by 2002:a0c:f502:0:b0:66d:130c:bb9d with SMTP id j2-20020a0cf502000000b0066d130cbb9dmr7134657qvm.13.1697288939463; Sat, 14 Oct 2023 06:08:59 -0700 (PDT) Received: from hurd (dsl-156-181.b2b2c.ca. [66.158.156.181]) by smtp.gmail.com with ESMTPSA id u16-20020a0562140b1000b00656373f9c30sm1641604qvj.75.2023.10.14.06.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 06:08:58 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. In-Reply-To: (Liliana Marie Prikler's message of "Thu, 12 Oct 2023 08:25:26 +0200") References: Date: Sat, 14 Oct 2023 09:08:58 -0400 Message-ID: <87mswl4ahh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 (-) Hi Liliana, The v2 series LGTM. Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 09:27:32 2023 Received: (at 66480) by debbugs.gnu.org; 14 Oct 2023 13:27:32 +0000 Received: from localhost ([127.0.0.1]:48179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qreg0-0000UH-Ag for submit@debbugs.gnu.org; Sat, 14 Oct 2023 09:27:32 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrefv-0000Tz-CS for 66480@debbugs.gnu.org; Sat, 14 Oct 2023 09:27:30 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-40572aeb73cso30838905e9.3 for <66480@debbugs.gnu.org>; Sat, 14 Oct 2023 06:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697290017; x=1697894817; darn=debbugs.gnu.org; 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=cJb+3qsIPGM/07ndTggBrheP+Ca9CPVDzxB0+70cxyY=; b=ad+Sek1nh6q5FyTl3H29eX5UC4g+70suXzs+3RJ2bJUCOZWggV+swIqljIRAmBleDV jg2tevMuh992JMLPRSLu1eGR42h7QgahwdlLfMvrQlR1Z7tNwFIn3MDFNX7AUyC4Cupx eNywglaVfF7a/nq7z8ohU72HtKUYt5g7YJ+GxdF5X+nX30wjrCydr92sgGQll5sq38Jb IIXFu1uJYFLAZxAa43PsMiSdGAFKD3X7HD9ZFU71umGf79fFQqNiGEqmAgau/p+bYT8H DyuKxVi+XysnxOvKqD55sxcUfzvo49Kkw9oQseUqtKrQRe0YTtQfkbnEGjIyqHXmlOtj 94zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697290017; x=1697894817; 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=cJb+3qsIPGM/07ndTggBrheP+Ca9CPVDzxB0+70cxyY=; b=UTVDLE0EBohz0xqB8VxwHR4pLrynwJvbKgysPJjyvzP3tYLUtVMiw4M2OEA1lKsfSR KCVqEXmwzTyQzgLuVYgXgTMBy712oFO3E4FD6YdoK5qniuqGcanfUX1rp+cASP/gzwOz +2oSUqlPH9h9TdsmeP7nFhyKC2wh0Yv94t80RszV3zMSMmfvfo1AiR/7yM66VtoQ4Me4 YiMGRHERZGFG9DhA9+Saoo36K9X+jdoQxrLjppaugcbZ07U+iwEuTGDs65MCcuIIQxVn +p1W+8djbwjiCR/uBP1HfWquDXp+Qi/dlXXpdvuyRudZSgyj81dgGc0ZaAnl8H17qIBQ Tn1w== X-Gm-Message-State: AOJu0Ywdrx46Kw+msgvGJrck6Z9ODoqSGVeMfYKhOCJBGASGTZYToJT+ 57f5rscF/f6P7Ksbg1nihNk= X-Google-Smtp-Source: AGHT+IGuQLQDNVjHG8I9r7y6xYgQWrKVWH8h0jtvjWEZmdZu9WPBXz18d60erOXFUwZwPVO3MxqXSA== X-Received: by 2002:a7b:c454:0:b0:403:b6bc:dc83 with SMTP id l20-20020a7bc454000000b00403b6bcdc83mr25978394wmi.38.1697290017338; Sat, 14 Oct 2023 06:26:57 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id o6-20020a05600c4fc600b0040472ad9a3dsm2002497wmq.14.2023.10.14.06.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 06:26:56 -0700 (PDT) Message-ID: Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 14 Oct 2023 15:26:52 +0200 In-Reply-To: <87mswl4ahh.fsf@gmail.com> References: <87mswl4ahh.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: > Hi Liliana, >=20 > The v2 series LGTM. >=20 > Maxim Hi Maxim, did you also attempt to build it? CI sadly doesn't and my personal machine doesn't like building Webkit :( Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 11:38:06 2023 Received: (at 66480) by debbugs.gnu.org; 14 Oct 2023 15:38:06 +0000 Received: from localhost ([127.0.0.1]:50216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrgiM-00084K-AF for submit@debbugs.gnu.org; Sat, 14 Oct 2023 11:38:06 -0400 Received: from mail-yb1-xb2f.google.com ([2607:f8b0:4864:20::b2f]:61488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrgiK-00083o-GN for 66480@debbugs.gnu.org; Sat, 14 Oct 2023 11:38:05 -0400 Received: by mail-yb1-xb2f.google.com with SMTP id 3f1490d57ef6-d77ad095f13so3078429276.2 for <66480@debbugs.gnu.org>; Sat, 14 Oct 2023 08:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697297855; x=1697902655; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=PPWQXCJ7rsMXfNaEbyzqCK0mqMUixY+AbQ3sayUawdA=; b=MomtZ/db0FtYJlZHQTXuE7iQTZ14ZAWNZe30k2LcD5o6+vPDK0IUOu4EJs1jCTwo3C cdZLyxTtNhjSSULy1QAO+Dfax4EFfNeKcXtbrprsKrlcPGKNlfRGdM4Kfd7q5/kbPT2J j4QojyulvVR7C0W0thJ5Jinj6agCuguE4Ap6OGnJDWXj5wVJ09pxy/u6qvmceeNSexO0 q+6DVo3+ZJVmUpwt6b/89nrP5K0Z/p8M+mlZITukUlD9mzMK6bIvBHpuNpWiFuKffM81 IDZ1wSXFOCA+d1uVmHN3V/FfC3KYMcv/srF/VyTZ/J3ONrvdtGltcH4NYdm19rANgW3L fdfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697297855; x=1697902655; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PPWQXCJ7rsMXfNaEbyzqCK0mqMUixY+AbQ3sayUawdA=; b=luNgZ0vVJmkrxEB6qQ18xc8r9dSWsE4KBUhEy5JHDH0plzdvzkbLiaTnF0bRi+hM05 ugPeJKRfF4tvC06TC2LlCntG87QXnLTM43ajYWAqmouMbB8vaBa40BYI04RgxCRLxFQk q0k94C702fi/LIi3vh2fraJX2y3Njm09amNg5imhAMMVvuIDDHbMmxgJQzs7vIKjz338 DRtvgcn+u6vVMSPOWnry0IQnJsOk8N8IA9yvqcY8dLxwke02jgLnvlwxahydHCtoAcjQ e/NK4nOUP9niv3KfRBE6LVBIXgEijtp2dQmIb5wqtKkiBxDh/LzrrCoCd8AsGi+F9Cyf Xz7w== X-Gm-Message-State: AOJu0YxtFxFaMq/rKJ5GRnpSJd/UhDKOK3MP1UjuQr1thi8kuNz7PUed +V0nmw9uYfs3HJiD6HV4hJQ= X-Google-Smtp-Source: AGHT+IHXhdjhwlol1wzXgBvDHRQFTM09Vu3r7ltfe8yJCEO/k/rXc+M7xHjCFloZs3RsK2MlfU59lQ== X-Received: by 2002:a25:6886:0:b0:d9a:ce53:4942 with SMTP id d128-20020a256886000000b00d9ace534942mr7196619ybc.0.1697297855049; Sat, 14 Oct 2023 08:37:35 -0700 (PDT) Received: from hurd (dsl-156-181.b2b2c.ca. [66.158.156.181]) by smtp.gmail.com with ESMTPSA id f26-20020ad4559a000000b0065b02eaeee7sm1752959qvx.83.2023.10.14.08.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 08:37:34 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. In-Reply-To: (Liliana Marie Prikler's message of "Sat, 14 Oct 2023 15:26:52 +0200") References: <87mswl4ahh.fsf@gmail.com> Date: Sat, 14 Oct 2023 11:37:33 -0400 Message-ID: <8734yd43lu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 (-) Hi, Liliana Marie Prikler writes: > Am Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >> >> The v2 series LGTM. >> >> Maxim > Hi Maxim, > > did you also attempt to build it? CI sadly doesn't and my personal > machine doesn't like building Webkit :( I haven't tried building it, so I don't know! Why doesn't CI build it? Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 12:25:34 2023 Received: (at 66480) by debbugs.gnu.org; 14 Oct 2023 16:25:34 +0000 Received: from localhost ([127.0.0.1]:50264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhSI-0001CI-9r for submit@debbugs.gnu.org; Sat, 14 Oct 2023 12:25:34 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:50309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhSD-0001Bu-OB for 66480@debbugs.gnu.org; Sat, 14 Oct 2023 12:25:33 -0400 Received: by mail-wr1-x443.google.com with SMTP id ffacd0b85a97d-31427ddd3fbso2756928f8f.0 for <66480@debbugs.gnu.org>; Sat, 14 Oct 2023 09:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697300700; x=1697905500; darn=debbugs.gnu.org; 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=zhLIP7SUEg25lqnH4UVg/B33+n3CUhjXmKgnpzuPfOU=; b=N8A59OuCoYN8p0f3y3PTfaUIMsloBtKeumTMQIpmGFxuQD+byb+apDrIKuD0m87Llu ExcypW7ITmTjcD7TKrWWXAnmyRpCvKsqxOdjCOSgnWklfQojKVSCQxmcbqlNiwf5R6kM hVFLZMowZ+y8VtkHjoVHRVUMVtgQgtmEkK5p3DEvhey7cUTm01ZPvZ59TTS53O8jB9qk 8+qo5HKErn03PIOwv40XHJZwB6Mudr2oFUiFRL9Js8Q1q/Sn+szocicVuzcwQ1soRbOf Zy+FlY+3nmtHdLjD7b7byVNvHuUBpIXZHVMzHsy91JQ9Y5sq3GpS07iS4aoqb+2iX9q/ Llzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697300700; x=1697905500; 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=zhLIP7SUEg25lqnH4UVg/B33+n3CUhjXmKgnpzuPfOU=; b=mgvmXJT8tyzCDIbzETYp1plcgPXGRb43Ed8A0xChEMpCNn7WrMKvC0nNEcc4pkWP5R 5Hy4rmF06GSTQ8bO6vIBrKDDvtXbtyUq/TV2v4pyQAYMzq7XE+5lkMn+E4QIhp315TSV 5ig+A5MSvJCTP/9H48yUIbToRXtsKar/qdvG23DMffDGR8T3VG/TBWwHf1OyAY2J9V/U 0tf7tCsFPh8cmJ0X8ZCQrh3jQTfBnnGsBPCu0dfH0Xf8bZOJ18nzhZnh3p7fLW9YiHE6 ggKrdqVTyHMH4/rSN7msoA2hMethwyUoPSr4ogZNfJ0RS8kwlc7IZDIF3CGHtCU2aNkS 9ZQw== X-Gm-Message-State: AOJu0Yz+hYG/a+IxOSYxJkVw8kYuwskIY3qDvImrypf6CVm9GeALhJZZ 74UMOdeeoW4q8vH5hl6Xic8= X-Google-Smtp-Source: AGHT+IG7wfq5Fmulps+FMzgG632Iq7jDu3HxegxNlZWdiJiYYpQY6QbdB3KwbtFrF513TFCAUHZysw== X-Received: by 2002:adf:f791:0:b0:32d:a022:8559 with SMTP id q17-20020adff791000000b0032da0228559mr3118595wrp.47.1697300699887; Sat, 14 Oct 2023 09:24:59 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id 4-20020a05600c028400b004064741f855sm2312564wmk.47.2023.10.14.09.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 09:24:59 -0700 (PDT) Message-ID: <1723d8884c54e973dd7a709209f847e74f3d0b64.camel@gmail.com> Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 14 Oct 2023 18:24:56 +0200 In-Reply-To: <8734yd43lu.fsf@gmail.com> References: <87mswl4ahh.fsf@gmail.com> <8734yd43lu.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480 Cc: rg@raghavgururajan.name, 66480@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 Samstag, dem 14.10.2023 um 11:37 -0400 schrieb Maxim Cournoyer: > Hi, >=20 > Liliana Marie Prikler writes: >=20 > > Am Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: > > > Hi Liliana, > > >=20 > > > The v2 series LGTM. > > >=20 > > > Maxim > > Hi Maxim, > >=20 > > did you also attempt to build it?=C2=A0 CI sadly doesn't and my persona= l > > machine doesn't like building Webkit :( >=20 > I haven't tried building it, so I don't know!=C2=A0 Why doesn't CI build > it? >=20 > Maxim Beats me; apparently it fails at applying the patch. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 15 07:12:59 2023 Received: (at 66480) by debbugs.gnu.org; 15 Oct 2023 11:12:59 +0000 Received: from localhost ([127.0.0.1]:51351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrz3L-0007mP-GM for submit@debbugs.gnu.org; Sun, 15 Oct 2023 07:12:59 -0400 Received: from planete-kraus.eu ([89.234.140.182]:52926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrz3H-0007mE-Fn for 66480@debbugs.gnu.org; Sun, 15 Oct 2023 07:12:58 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 00b4b949 for <66480@debbugs.gnu.org>; Sun, 15 Oct 2023 11:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type :content-transfer-encoding:mime-version; s=albinoniB; bh=FsK0SJj gbi1G3uXYu3nOsPxWSoE=; b=Tp+iQrrg+9UXrqYmljtaxhN3LsjLihkmGw8fAHG FKqEBxdb2KTC/55eGujdsH8+FeYkrr4E111B0y2ErGt2Qcz+WmjSHdY0p9RT8LGx jRbWlrUA+9FV4ZTRP7r0DvAsK7/AXDmRsJPb5J8R6KFEHIaGQDtkmX3nW8rGFAkL 4loQPqIZcK/7Rol/d3kuqvGu2Pc+fWB3d5xSjwhkPRjDokciKm006OU1ZfkUFDa6 SgOUI/9nCFv7iW3KAyDOxUpu+cls+Vq3rS1wYJScOekZxAIPngzFbXBm346OJxEC jzUkjFTdO94iAb8quqg62qC+u6cv2EI0qZPV9L3H7dNyOAw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d8ab2cb3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66480@debbugs.gnu.org>; Sun, 15 Oct 2023 11:12:28 +0000 (UTC) Message-ID: <3de82441a18e2821b277a0f1efc9bbef9e7c8d7c.camel@planete-kraus.eu> Subject: Webkit update breaks gnome-online-accounts From: Vivien Kraus To: 66480@debbugs.gnu.org Date: Sun, 15 Oct 2023 13:12:26 +0200 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66480 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 (-) Dear guix, I am excited to see new webkitgtks, but gnome-online-accounts now fails to build: ../gnome-online-accounts-3.48.0/meson.build:100:28: ERROR: Dependency "javascriptcoregtk-4.1" not found, tried pkgconfig Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 22 06:42:13 2023 Received: (at 66480) by debbugs.gnu.org; 22 Oct 2023 10:42:13 +0000 Received: from localhost ([127.0.0.1]:45507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quVuO-0003Vd-Lz for submit@debbugs.gnu.org; Sun, 22 Oct 2023 06:42:13 -0400 Received: from planete-kraus.eu ([89.234.140.182]:50498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quVuK-0003VR-3j for 66480@debbugs.gnu.org; Sun, 22 Oct 2023 06:42:12 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 456f068e for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 10:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=albinoniB; bh=zykxrZZOuG/iIa5OucK17ULOEjI=; b=u 5sjLzuDN5v9yaHJB7QkMOUX2asjSUnmUc9YspZCP+fWdFRhgq2x6SoQmiCrsWjTk ubek25wTkkOQE1Z6zEyPjJVKZb1AtHz64wpbCkXIB9pIc9M39Jw4iHmS7USwleHT G7CCM1yggKKS/VKioLfs6m3fgFaogS9wn94ynxfRNRN6aEclxXZarm1w1sjBXu0H ijyufLK9dIkMkyvOmdHSuMTKT/zEzYhsho6h0mZ8cwcfoCR7ne368alnVAeVWvRx jFLqarXkr7NvTyK6YG+H44sBSXPxTLuu9DuNyk5GdlyLbbKhy+texZIQKWaRBUAz PFJqf1Dn9N9qS+F2onLuQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 91b68956 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 10:41:37 +0000 (UTC) Message-ID: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> In-Reply-To: <3de82441a18e2821b277a0f1efc9bbef9e7c8d7c.camel@planete-kraus.eu> References: <3de82441a18e2821b277a0f1efc9bbef9e7c8d7c.camel@planete-kraus.eu> From: Vivien Kraus Date: Sun, 22 Oct 2023 12:35:21 +0200 Subject: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. To: 66480@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66480 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 (-) * gnu/packages/gnome.scm (gnome-online-accounts): Likewise. --- Dear guix, You forgot to request webkitgtk-for-gtk3 for gnome-online-accounts. Here is a formal fixup. Best regards, Vivien gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e1edf6ccf5..a02d1a475a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8037,7 +8037,7 @@ (define-public gnome-online-accounts libsecret mit-krb5 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Single sign-on framework for GNOME") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") (description base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf prerequisite-patch-id: 66465be264c2a9d61434147df12d649236de42fd prerequisite-patch-id: c62b68675eca65ffc5a468d51f722fa849609111 prerequisite-patch-id: fcec6d4aa0e02f9cef07d44e6dbb2ea8664e89b2 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 22 09:06:34 2023 Received: (at 66480) by debbugs.gnu.org; 22 Oct 2023 13:06:34 +0000 Received: from localhost ([127.0.0.1]:45625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYA5-000588-IP for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:06:33 -0400 Received: from planete-kraus.eu ([89.234.140.182]:46772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYA0-00057v-Aj for 66480@debbugs.gnu.org; Sun, 22 Oct 2023 09:06:32 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 65676db3 for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 13:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=albinoniB; bh=yM+Hq1JN9b3WCiPOU1zfeXqyvb0=; b=A CL13i4NOfVtpjdn1JDK72DBZ6jqgwei9OkckGnYbShM+eCxcNDbWAVcYGI0614DD wuTkxfObT8eGNXNr3bN2x7Wh6PhnMBlYNXl41fcpzGtOvk82eqbUPD67Icd78bse B3LmYV4wbu50zqwi1+26+UmW9ZBTe3WXN8CYUU4aZPn8wQlKiVL8jCL1b67DVJS+ cUlU3H+iiCk29aSv4pKeU3AIvyXhcaL8YyiAIF8vAuAGLzmlwAQg5VJ1lHnQ+yG3 J+3pDY/2ArW8oWivJBSXlz4iSxxWe8T2dy8ezPI47HCYibhEvl5qb0n6xevUMy8O FSLJwP1+MMS1dwWbLceVg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 97f6b89a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 13:05:57 +0000 (UTC) Message-ID: <7bfd3d0707130c3e633858671cb13b85f8f71661.1697979906.git.vivien@planete-kraus.eu> In-Reply-To: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> References: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Sun, 22 Oct 2023 15:01:25 +0200 Subject: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. To: 66480@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66480 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 (-) --- Dear guix, I was puzzled as to why webkitgtk-with-libsoup2 received -DUSE_GTK4=ON, when it was strictly removed from its base, webkitgtk-for-gtk3. Now I know. Best regards, Vivien gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index a374711119..7e0370abc0 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -304,11 +304,11 @@ (define-public webkitgtk-for-gtk3 (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments webkitgtk) + (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3) ((#:configure-flags flags) #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs - (modify-inputs (package-propagated-inputs webkitgtk) + (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3) (replace "libsoup" libsoup-minimal-2))))) (define-public wpewebkit base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf prerequisite-patch-id: 66465be264c2a9d61434147df12d649236de42fd prerequisite-patch-id: c62b68675eca65ffc5a468d51f722fa849609111 prerequisite-patch-id: fcec6d4aa0e02f9cef07d44e6dbb2ea8664e89b2 prerequisite-patch-id: 72cb2efc1b4a24f25196480972bddf0b4d78103a -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 22 18:29:59 2023 Received: (at 66480-done) by debbugs.gnu.org; 22 Oct 2023 22:29:59 +0000 Received: from localhost ([127.0.0.1]:48468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qugxL-0000Kr-7a for submit@debbugs.gnu.org; Sun, 22 Oct 2023 18:29:59 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:48330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qugxI-0000Kc-1j for 66480-done@debbugs.gnu.org; Sun, 22 Oct 2023 18:29:57 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9b95622c620so405795066b.0 for <66480-done@debbugs.gnu.org>; Sun, 22 Oct 2023 15:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698013761; x=1698618561; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=sk4CVQtyYBt8EOAfm9hw1+ypsX9xsAQlSOJaLpKyHh4=; b=EeCyOhkZoxKn6GR0kZ1kThHt5zaKrwbQ3BpXLhaV/TKyiFAwhVCfTvWc1Ljgg/Mi3x ccpgRfOrR/cb5QIqLC5L0F9PhrrAolIy7Jndqj5uzgN/wIjv8YvC883j3ygnXKYIMQPx E6h2JSpVbA4kSCli/G7q+pBl4TJ4ZuEV/pSyeUeeTjUa6zc8yYksIA89Nk+a9bzMejjM dyU3fSszPjNUqtuyBEU+B1KvLDsUBFhEcifwB51MA6k+uLclyiTfHaoZJ4j6Q1AaOhiF hEnmJMOns319duR5Q0BGUFjdiT+ZJ/lw4nVwBQ40IkP+vLFPSviFtcf/uP9rQCrAmL9f aXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698013761; x=1698618561; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sk4CVQtyYBt8EOAfm9hw1+ypsX9xsAQlSOJaLpKyHh4=; b=GWBEhx9pqQdRmH+RSJS3TQh7wzz5/dZNO2NTCdNiauMRBlopjPF8vOeWnvGo73TGmG MIwY6FjPZuGGGrXa03YyS6qg+5rflU+LSr1GzDNH3LOYZkkM8c0zLhShE8z8mxhFOX+W nx14iQHH9nMAJZnTkwkStvqX0VvKFAYmyYvvQpoL4oFSeXixGC+FfJglty2IZo46i9sL itWqW3kQcyLo6Sqcf/PBzQP1z8XOdDSRB1iyn21ouIC1odzipDbmqv3oBvTcpp/vE6q+ JUtnMHNnuGBmOmrufz3WL5n+Z0xWFeqotBt6ZbFAym1H5uGyR/5LU6gwP62p3gdS8r7j VaSQ== X-Gm-Message-State: AOJu0YyOMsbVg6gGPcyv6uBQDfTKks3EmbFL1exgIhHNdhh8MCU+OGrX CcIusyzA7lyKCJGU5JccbZtyc5k1lyK8Sw== X-Google-Smtp-Source: AGHT+IFeOkgLCNw8DixVKB6eUSwP+WFwgleffOqO4ijP+wSL+QlyAlgcDYkJM1LkTPsKVnssW/ZUMg== X-Received: by 2002:a17:907:8691:b0:9bf:a01c:8213 with SMTP id qa17-20020a170907869100b009bfa01c8213mr5754094ejc.11.1698013761222; Sun, 22 Oct 2023 15:29:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id m2-20020a17090607c200b009c6a4a5ac80sm5561118ejc.169.2023.10.22.15.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 15:29:20 -0700 (PDT) Message-ID: <7a1766c45b274cfba01e97e24002b0aeec425cbb.camel@gmail.com> Subject: Re: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. From: Liliana Marie Prikler To: Vivien Kraus , 66480-done@debbugs.gnu.org Date: Mon, 23 Oct 2023 00:29:19 +0200 In-Reply-To: <7bfd3d0707130c3e633858671cb13b85f8f71661.1697979906.git.vivien@planete-kraus.eu> References: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> <7bfd3d0707130c3e633858671cb13b85f8f71661.1697979906.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66480-done 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 Sonntag, dem 22.10.2023 um 15:01 +0200 schrieb Vivien Kraus: > --- > Dear guix, >=20 > I was puzzled as to why webkitgtk-with-libsoup2 received - > DUSE_GTK4=3DON, when it was strictly removed from its base, webkitgtk- > for-gtk3.=C2=A0 Now I know. Sorry, saw this too late. Pushed the series with the previous fixup but without this one. Added this one now. Marking as done, but feel free to reopen if this breaks builds. Cheers From unknown Sun Jun 22 11:35:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 20 Nov 2023 12:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator