From patchwork Wed Oct 11 20:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54816 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5979A27BBEA; Fri, 13 Oct 2023 19:48:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C96027BBE2 for ; Fri, 13 Oct 2023 19:48:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrNDF-00012k-Ui; Fri, 13 Oct 2023 14:48:41 -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 1qrNDF-00012M-2l for guix-patches@gnu.org; Fri, 13 Oct 2023 14:48:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qrNDE-00062k-QX for guix-patches@gnu.org; Fri, 13 Oct 2023 14:48:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrNDZ-00020Q-Rw; Fri, 13 Oct 2023 14:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66480] [PATCH gnome-team v2 1/2] gnu: webkitgtk: Update to 2.42.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66480@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66480-submit@debbugs.gnu.org id=B66480.16972229307632 (code B ref 66480); Fri, 13 Oct 2023 18:49:01 +0000 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 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1. [inputs]: Add libjxl. --- gnu/packages/webkit.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf prerequisite-patch-id: 200a55f018acd42885dcb3cd10ec7b17524d8dd4 prerequisite-patch-id: dfca7d9abc3417513768cc76f3ed499dc255ae93 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 From patchwork Thu Oct 12 06:25:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54818 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 966AA27BBE9; Fri, 13 Oct 2023 19:49:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F00B27BBE2 for ; Fri, 13 Oct 2023 19:49:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrNDH-00013C-Dg; Fri, 13 Oct 2023 14:48:43 -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 1qrNDE-000127-H2 for guix-patches@gnu.org; Fri, 13 Oct 2023 14:48:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qrNDE-00062Z-8b for guix-patches@gnu.org; Fri, 13 Oct 2023 14:48:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrNDa-00020W-BS; Fri, 13 Oct 2023 14:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 18:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66480@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66480-submit@debbugs.gnu.org id=B66480.16972229337659 (code B ref 66480); Fri, 13 Oct 2023 18:49:02 +0000 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 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)