From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: "52005@debbugs.gnu.org" <52005@debbugs.gnu.org>
Subject: [bug#52005] [PATCH] [core-updates-frozen] gnu: emacs-xwidgets/-next-pgtk: Replace webkitgtk with webkitgtk-with-libsoup2.
Date: Sat, 20 Nov 2021 19:25:04 +0000 [thread overview]
Message-ID: <ss2l2W2jYaL4g0hbpoS1MO-7J9UQzfSE0LTkaOg-ujsgHi3nua_2XJO0qQS34ixwvcfIRPt0vV0WxPzQsz7bh0WlsYrQVqGCmUOa7Bh7ld8=@protonmail.com> (raw)
In-Reply-To: <zVQzP9bHdO_a5VJMh0W_u5ceaECKyFowDlbeffRkMtgTrff9pKNHhsy09y0mKwrKoVMgn-mMqhaOLBh7gbmG7MqOLRxqFQj1gyRSBMVyUjM=@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 109 bytes --]
Forgot copyright lines, if it is needed for either or both files. Updated patch to include them if necessary.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-xwidgets-next-pgtk-Replace-webkitgtk-with-.patch --]
[-- Type: text/x-patch; name=0001-gnu-emacs-xwidgets-next-pgtk-Replace-webkitgtk-with-.patch, Size: 2837 bytes --]
From 8816823847395556b0ffc161f2891ebfd118745b Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
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 <bandali@gnu.org>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; 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 <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; 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
next prev parent reply other threads:[~2021-11-20 19:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-20 19:16 [bug#52005] [PATCH] [core-updates-frozen] gnu: emacs-xwidgets/-next-pgtk: Replace webkitgtk with webkitgtk-with-libsoup2 John Kehayias via Guix-patches via
2021-11-20 19:25 ` John Kehayias via Guix-patches via [this message]
2021-11-21 15:44 ` bug#52005: " Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='ss2l2W2jYaL4g0hbpoS1MO-7J9UQzfSE0LTkaOg-ujsgHi3nua_2XJO0qQS34ixwvcfIRPt0vV0WxPzQsz7bh0WlsYrQVqGCmUOa7Bh7ld8=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=52005@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).