From patchwork Sat Nov 20 19:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 34709 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 1210827BBE3; Sat, 20 Nov 2021 19:17:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F0D127BBE1 for ; Sat, 20 Nov 2021 19:17:11 +0000 (GMT) Received: from localhost ([::1]:44698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moVrK-0006Xo-DX for patchwork@mira.cbaines.net; Sat, 20 Nov 2021 14:17:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moVrC-0006X4-Mr for guix-patches@gnu.org; Sat, 20 Nov 2021 14:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moVrC-0004z5-Dw for guix-patches@gnu.org; Sat, 20 Nov 2021 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moVrB-0003kB-TA for guix-patches@gnu.org; Sat, 20 Nov 2021 14:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52005] [PATCH] [core-updates-frozen] gnu: emacs-xwidgets/-next-pgtk: Replace webkitgtk with webkitgtk-with-libsoup2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 19:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52005 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52005@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.163743580214333 (code B ref -1); Sat, 20 Nov 2021 19:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Nov 2021 19:16:42 +0000 Received: from localhost ([127.0.0.1]:43680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moVqo-0003j0-Vr for submit@debbugs.gnu.org; Sat, 20 Nov 2021 14:16:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:46326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moVqj-0003ip-Gl for submit@debbugs.gnu.org; Sat, 20 Nov 2021 14:16:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moVqj-0006VO-C9 for guix-patches@gnu.org; Sat, 20 Nov 2021 14:16:33 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:60118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moVqc-0004pw-HB for guix-patches@gnu.org; Sat, 20 Nov 2021 14:16:28 -0500 Date: Sat, 20 Nov 2021 19:16:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637435779; bh=y4MXnH0n196BXoGgHSxYCSfPVa8Gi5IH8iJtZjS5bJQ=; h=Date:To:From:Reply-To:Subject:From; b=JTaVAn8yG8nrAKl6OnK0iADmzVHEIdpwqz40AQLgQ9H0sQe5AmC/w500iX97Gt019 2+CvaKz0hkQRiz/OoUZjWsa8wjq/nw3C0WGqjDyPHoZqeSvroXukEb2GHoltl9QD6r AQytP/rkzMJ5k0sa8yQkxMOjbydKmnVdCKEwmyuA= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch 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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hello, Emacs with xwidgets support needs webkit2gtk-4.0, which for us means the variant built with libsoup2 on core-updates-frozen. I've changed the inputs in the two affected Emacs packages and added to the comment about where webkitgtk-with-libsoup2 is used. Apologies if the formatting/style of the commit message is off, wasn't sure how best to do this. John From 17dd0a5748bc4a984393812e395e88c6060cbf55 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 20 Nov 2021 14:03:08 -0500 Subject: [PATCH] gnu: emacs-xwidgets/-next-pgtk: Replace webkitgtk with webkitgtk-with-libsoup2. * gnu/packages/emacs.scm (emacs-xwidgets and emacs-next-pgtk)[inputs]: Replace webkitgtk with webkitgtk-with-libsoup2. * gnu/packages/webkit.scm (webkitgtk-with-libsoup2): Add further information about where this package is used and upstream tracker for libsoup3. --- gnu/packages/emacs.scm | 4 ++-- gnu/packages/webkit.scm | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 734f3dfaa3..fbd9ff96f0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -354,7 +354,7 @@ (define-public emacs-next-pgtk `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("glib-networking" ,glib-networking))) (inputs - `(("webkitgtk" ,webkitgtk) + `(("webkitgtk" ,webkitgtk-with-libsoup2) ,@(package-inputs emacs-next))) (home-page "https://github.com/masm11/emacs") (synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support") @@ -400,7 +400,7 @@ (define-public emacs-xwidgets (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap))))) (inputs - `(("webkitgtk" ,webkitgtk) + `(("webkitgtk" ,webkitgtk-with-libsoup2) ("libxcomposite" ,libxcomposite) ,@(package-inputs emacs))))) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 5230129158..f988bf0697 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -364,6 +364,9 @@ (define-public webkitgtk ;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3, ;;; which causes the build to fail. +;;; Also required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other +;;; Gnome packages for webkit2gtk-4.0. See also the upstream tracker for +;;; libsoup 3: https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk (name "webkitgtk-with-libsoup2") -- 2.34.0