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