From patchwork Sat Nov 20 19:25:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 34710 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 5590527BBE3; Sat, 20 Nov 2021 19:26:15 +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 C700D27BBE1 for ; Sat, 20 Nov 2021 19:26:14 +0000 (GMT) Received: from localhost ([::1]:46946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moW06-00004s-1V for patchwork@mira.cbaines.net; Sat, 20 Nov 2021 14:26:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moVzv-0008WH-1N for guix-patches@gnu.org; Sat, 20 Nov 2021 14:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moVzu-0000G3-7l for guix-patches@gnu.org; Sat, 20 Nov 2021 14:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moVzu-00040A-3l for guix-patches@gnu.org; Sat, 20 Nov 2021 14:26:02 -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. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 19:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52005 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "52005@debbugs.gnu.org" <52005@debbugs.gnu.org> Received: via spool by 52005-submit@debbugs.gnu.org id=B52005.163743632315327 (code B ref 52005); Sat, 20 Nov 2021 19:26:02 +0000 Received: (at 52005) by debbugs.gnu.org; 20 Nov 2021 19:25:23 +0000 Received: from localhost ([127.0.0.1]:43698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moVzC-0003z5-UD for submit@debbugs.gnu.org; Sat, 20 Nov 2021 14:25:23 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:58769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moVzB-0003ym-6o for 52005@debbugs.gnu.org; Sat, 20 Nov 2021 14:25:17 -0500 Date: Sat, 20 Nov 2021 19:25:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637436306; bh=8EOlqT2NM9XdtLvfGBgGU/oebhuPlxcD6yXLlpcN0Ns=; h=Date:To:From:Reply-To:Subject:From; b=pTIkeF+6q956zfW2n7cKd1Ip33Sr+pL3HKuJ4ruLMHuGRNn5RXZxjlY73MHBx1FB5 auogyIkiG7Mowf5U90QwBbUxJslrJCXQPXKlY6yl/nwszuNxkSONXFARV9oyXj3rpa oZzQ1VmRm2Qp5i+HKQX1/e23Qo/Tcu7IO91KT8jE= Message-ID: 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" 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 Forgot copyright lines, if it is needed for either or both files. Updated patch to include them if necessary. From 8816823847395556b0ffc161f2891ebfd118745b 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 | 5 +++-- gnu/packages/webkit.scm | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 734f3dfaa3..9168d2dde2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2019 Amin Bandali ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -354,7 +355,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 +401,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..1fe662d4e2 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -364,6 +365,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