ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-xwidgets{,-next-pgtk}: Use webkitgtk-with-libsoup2.

Browse source 
* gnu/packages/emacs.scm (emacs-xwidgets, 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.
This commit is contained in:
John Kehayias 2021-11-20 14:03:08 -05:00 committed by Tobias Geerinckx-Rice
parent 01ea70a29c
commit 85de88f1ad
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/emacs.scm
View file

@ -354,7 +354,7 @@ (define-public emacs-next-pgtk
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("glib-networking" ,glib-networking))) ("glib-networking" ,glib-networking)))
(inputs (inputs
`(("webkitgtk" ,webkitgtk) `(("webkitgtk" ,webkitgtk-with-libsoup2)
,@(package-inputs emacs-next))) ,@(package-inputs emacs-next)))
(home-page "https://github.com/masm11/emacs") (home-page "https://github.com/masm11/emacs")
(synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support") (synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support")
@ -400,7 +400,7 @@ (define-public emacs-xwidgets
(delete 'restore-emacs-pdmp) (delete 'restore-emacs-pdmp)
(delete 'strip-double-wrap))))) (delete 'strip-double-wrap)))))
(inputs (inputs
`(("webkitgtk" ,webkitgtk) `(("webkitgtk" ,webkitgtk-with-libsoup2)
("libxcomposite" ,libxcomposite) ("libxcomposite" ,libxcomposite)
,@(package-inputs emacs))))) ,@(package-inputs emacs)))))

3
gnu/packages/webkit.scm
View file

@ -364,6 +364,9 @@ (define-public webkitgtk
;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3, ;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3,
;;; which causes the build to fail. ;;; 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 (define-public webkitgtk-with-libsoup2
(package/inherit webkitgtk (package/inherit webkitgtk
(name "webkitgtk-with-libsoup2") (name "webkitgtk-with-libsoup2")