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

Merge branch 'wip-webkit'

Browse source
This commit is contained in:
Liliana Marie Prikler 2023-12-18 09:29:48 +01:00
commit f410d49eb2
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
13 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/geo.scm
View file

@ -529,7 +529,7 @@ (define-public gnome-maps
libsoup libsoup
libxml2 libxml2
rest-next rest-next
webkitgtk)) webkitgtk-for-gtk3))
(synopsis "Graphical map viewer and wayfinding program") (synopsis "Graphical map viewer and wayfinding program")
(description "GNOME Maps is a graphical map viewer. It uses map data from (description "GNOME Maps is a graphical map viewer. It uses map data from
the OpenStreetMap project. It can provide directions for walking, bicycling, the OpenStreetMap project. It can provide directions for walking, bicycling,

30
gnu/packages/gnome.scm
View file

@ -1666,7 +1666,7 @@ (define-public sushi
libmusicbrainz libmusicbrainz
libxml2 libxml2
neon neon
webkitgtk)) webkitgtk-for-gtk3))
(synopsis "File previewer for the GNOME desktop") (synopsis "File previewer for the GNOME desktop")
(description "Sushi is a DBus-activated service that allows applications (description "Sushi is a DBus-activated service that allows applications
to preview files on the GNOME desktop.") to preview files on the GNOME desktop.")
@ -3398,7 +3398,7 @@ (define-public cambalache
python-pygobject python-pygobject
python-lxml python-lxml
webkitgtk webkitgtk
webkitgtk-next)) webkitgtk))
(native-inputs (native-inputs
(list `(,glib "bin") (list `(,glib "bin")
gobject-introspection gobject-introspection
@ -6175,7 +6175,7 @@ (define-public devhelp
pkg-config)) pkg-config))
(inputs (inputs
(list amtk (list amtk
webkitgtk)) webkitgtk-for-gtk3))
(home-page "https://wiki.gnome.org/Apps/Devhelp") (home-page "https://wiki.gnome.org/Apps/Devhelp")
(synopsis "API documentation browser for GNOME") (synopsis "API documentation browser for GNOME")
(description (description
@ -6188,7 +6188,7 @@ (define-public devhelp-with-libsoup2
(hidden-package (hidden-package
(package/inherit devhelp (package/inherit devhelp
(inputs (modify-inputs (package-inputs devhelp) (inputs (modify-inputs (package-inputs devhelp)
(replace "webkitgtk" webkitgtk-with-libsoup2)))))) (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))))
(define-public cogl (define-public cogl
(package (package
@ -7204,7 +7204,7 @@ (define-public epiphany
libxslt libxslt
nettle ; for hogweed nettle ; for hogweed
sqlite sqlite
webkitgtk)) webkitgtk-for-gtk3))
(home-page "https://wiki.gnome.org/Apps/Web") (home-page "https://wiki.gnome.org/Apps/Web")
(synopsis "GNOME web browser") (synopsis "GNOME web browser")
(description (description
@ -7394,7 +7394,7 @@ (define-public yelp
man-db ;for URIs like "man:ls" man-db ;for URIs like "man:ls"
groff-minimal ;ditto groff-minimal ;ditto
sqlite sqlite
webkitgtk webkitgtk-for-gtk3
yelp-xsl)) yelp-xsl))
(home-page "https://wiki.gnome.org/Apps/Yelp") (home-page "https://wiki.gnome.org/Apps/Yelp")
(synopsis "GNOME help browser") (synopsis "GNOME help browser")
@ -8074,7 +8074,7 @@ (define-public gnome-online-accounts
libsecret libsecret
mit-krb5 mit-krb5
rest-next rest-next
webkitgtk)) webkitgtk-for-gtk3))
(synopsis "Single sign-on framework for GNOME") (synopsis "Single sign-on framework for GNOME")
(home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts")
(description (description
@ -8107,7 +8107,7 @@ (define-public gnome-online-accounts-3.44
(delete 'disable-gtk-update-icon-cache))))) (delete 'disable-gtk-update-icon-cache)))))
(inputs (modify-inputs (package-inputs gnome-online-accounts) (inputs (modify-inputs (package-inputs gnome-online-accounts)
(replace "rest" rest) (replace "rest" rest)
(replace "webkitgtk" webkitgtk-with-libsoup2))))) (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))
(define-public evolution-data-server (define-public evolution-data-server
(package (package
@ -8193,7 +8193,7 @@ (define-public evolution-data-server
libphonenumber libphonenumber
mit-krb5 mit-krb5
openldap openldap
webkitgtk)) webkitgtk-for-gtk3))
(synopsis "Store address books and calendars") (synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution") (home-page "https://wiki.gnome.org/Apps/Evolution")
(description (description
@ -8220,7 +8220,7 @@ (define-public evolution-data-server-3.44
(modify-inputs (package-inputs evolution-data-server) (modify-inputs (package-inputs evolution-data-server)
(replace "gnome-online-accounts" gnome-online-accounts-3.44) (replace "gnome-online-accounts" gnome-online-accounts-3.44)
(replace "libgweather4" libgweather) (replace "libgweather4" libgweather)
(replace "webkitgtk" webkitgtk-with-libsoup2))) (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs evolution-data-server) (modify-inputs (package-propagated-inputs evolution-data-server)
(delete "gtk") (delete "gtk")
@ -11317,7 +11317,7 @@ (define-public lollypop
python-pygobject python-pygobject
python-pylast python-pylast
totem-pl-parser totem-pl-parser
webkitgtk)) webkitgtk-for-gtk3))
(propagated-inputs (propagated-inputs
(list gst-plugins-good ;required to start lollypop (list gst-plugins-good ;required to start lollypop
gst-plugins-ugly)) ;required for streaming gst-plugins-ugly)) ;required for streaming
@ -11786,7 +11786,7 @@ (define-public evolution
libsoup libsoup
nss nss
openldap openldap
webkitgtk webkitgtk-for-gtk3
ytnef)) ytnef))
(home-page "https://gitlab.gnome.org/GNOME/evolution") (home-page "https://gitlab.gnome.org/GNOME/evolution")
(synopsis "Manage your email, contacts and schedule") (synopsis "Manage your email, contacts and schedule")
@ -12405,7 +12405,7 @@ (define-public gnome-boxes
spice-gtk spice-gtk
tracker tracker
vte vte
webkitgtk)) webkitgtk-for-gtk3))
(home-page "https://wiki.gnome.org/Apps/Boxes") (home-page "https://wiki.gnome.org/Apps/Boxes")
(synopsis "View, access, and manage remote and virtual systems") (synopsis "View, access, and manage remote and virtual systems")
(description "GNOME Boxes is a simple application to view, access, and (description "GNOME Boxes is a simple application to view, access, and
@ -12479,7 +12479,7 @@ (define-public geary
libstemmer libstemmer
libunwind libunwind
sqlite sqlite
webkitgtk webkitgtk-for-gtk3
ytnef)) ytnef))
(native-inputs (native-inputs
(list appstream-glib (list appstream-glib
@ -13178,7 +13178,7 @@ (define-public komikku
python-rarfile python-rarfile
python-requests python-requests
python-unidecode python-unidecode
webkitgtk-next)) webkitgtk))
(native-inputs (native-inputs
(list desktop-file-utils (list desktop-file-utils
gettext-minimal gettext-minimal

6
gnu/packages/guile-xyz.scm
View file

@ -3433,7 +3433,7 @@ (define-public guile-gi
(guix build utils) (guix build utils)
(ice-9 popen) (ice-9 popen)
(ice-9 rdelim)) (ice-9 rdelim))
#:disallowed-references ,(list gtk+ webkitgtk) #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-dotted-circle-from-combining-character (add-after 'unpack 'remove-dotted-circle-from-combining-character
@ -3479,7 +3479,7 @@ (define-public guile-gi
(propagated-inputs (list gobject-introspection)) (propagated-inputs (list gobject-introspection))
(inputs (list guile-3.0 glib (inputs (list guile-3.0 glib
;; For tests, only relevant when compiling natively ;; For tests, only relevant when compiling natively
gtk+ webkitgtk)) gtk+ webkitgtk-for-gtk3))
(home-page "https://github.com/spk121/guile-gi") (home-page "https://github.com/spk121/guile-gi")
(synopsis "GObject bindings for Guile") (synopsis "GObject bindings for Guile")
(description (description
@ -4018,7 +4018,7 @@ (define-public nomad
("glib-networking" ,glib-networking) ("glib-networking" ,glib-networking)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin") ("gtk+:bin" ,gtk+ "bin")
("webkitgtk" ,webkitgtk) ("webkitgtk" ,webkitgtk-for-gtk3)
("gtksourceview" ,gtksourceview-4) ("gtksourceview" ,gtksourceview-4)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("vte" ,vte) ("vte" ,vte)

2
gnu/packages/lisp-xyz.scm
View file

@ -5065,7 +5065,7 @@ (define-public sbcl-cl-webkit
(inputs (inputs
`(("cffi" ,sbcl-cffi) `(("cffi" ,sbcl-cffi)
("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk-for-gtk3)))
(native-inputs (native-inputs
`(;; Tests seem to need Xorg. `(;; Tests seem to need Xorg.
;; ("xorg-server" ,xorg-server-for-tests) ;; ("xorg-server" ,xorg-server-for-tests)

2
gnu/packages/mail.scm
View file

@ -3931,7 +3931,7 @@ (define-public balsa
libsecret libsecret
openldap openldap
sqlite sqlite
webkitgtk)) webkitgtk-for-gtk3))
(native-inputs (native-inputs
(list compface (list compface
`(,glib "bin") intltool pkg-config yelp-tools)) `(,glib "bin") intltool pkg-config yelp-tools))

2
gnu/packages/mate.scm
View file

@ -775,7 +775,7 @@ (define-public atril
;; Build libkpathsea as a shared library for DVI support. ;; Build libkpathsea as a shared library for DVI support.
;; ("libkpathsea" ,texlive-bin) ;; ("libkpathsea" ,texlive-bin)
("poppler" ,poppler) ("poppler" ,poppler)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk-for-gtk3)))
(home-page "https://mate-desktop.org") (home-page "https://mate-desktop.org")
(synopsis "Document viewer for Mate") (synopsis "Document viewer for Mate")
(description (description

2
gnu/packages/music.scm
View file

@ -578,7 +578,7 @@ (define-public ctrlr
freetype freetype
libiberty libiberty
libx11 libx11
webkitgtk)) webkitgtk-for-gtk3))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://ctrlr.org/") (home-page "https://ctrlr.org/")

3
gnu/packages/rednotebook.scm
View file

@ -71,7 +71,8 @@ (define-public rednotebook
`("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path)))
#t)))))) #t))))))
(inputs (inputs
(list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk)) (list gtk+ gtksourceview-3 python-pyyaml python-pygobject
webkitgtk-for-gtk3))
;; TODO: package the following for python3 (if possible), add them as ;; TODO: package the following for python3 (if possible), add them as
;; dependencies, and remove them from rednotebook source: ;; dependencies, and remove them from rednotebook source:
;; pygtkspellcheck, elib.intl, msgfmt, txt2tags ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags

2
gnu/packages/syndication.scm
View file

@ -597,7 +597,7 @@ (define-public gfeeds
python-readability-lxml python-readability-lxml
python-requests python-requests
syndication-domination syndication-domination
webkitgtk-next)) webkitgtk))
(home-page "https://gfeeds.gabmus.org/") (home-page "https://gfeeds.gabmus.org/")
(synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader")
(description "Feeds is an RSS/Atom feed reader made with GTK+ (description "Feeds is an RSS/Atom feed reader made with GTK+

2
gnu/packages/telegram.scm
View file

@ -531,7 +531,7 @@ (define-public telegram-desktop
rnnoise rnnoise
wayland wayland
wayland-protocols wayland-protocols
webkitgtk webkitgtk-for-gtk3
webrtc-for-telegram-desktop webrtc-for-telegram-desktop
xcb-util-keysyms xcb-util-keysyms
xxhash xxhash

2
gnu/packages/vnc.scm
View file

@ -151,7 +151,7 @@ (define-public remmina
telepathy-glib telepathy-glib
vte ; for st plugin vte ; for st plugin
wayland wayland
webkitgtk ; for www plugin webkitgtk-for-gtk3 ; for www plugin
libx11 libx11
libxext ; for xdmcp plugin libxext ; for xdmcp plugin
xdg-utils xdg-utils

2
gnu/packages/web-browsers.scm
View file

@ -706,7 +706,7 @@ (define-public nyxt
gsettings-desktop-schemas gsettings-desktop-schemas
cl-gobject-introspection cl-gobject-introspection
gtk+ ; For the main loop gtk+ ; For the main loop
webkitgtk ; Required when we use its typelib webkitgtk-for-gtk3 ; Required when we use its typelib
gobject-introspection gobject-introspection
pkg-config)) pkg-config))
(synopsis "Extensible web-browser in Common Lisp") (synopsis "Extensible web-browser in Common Lisp")

36
gnu/packages/webkit.scm
View file

@ -126,14 +126,14 @@ (define-public wpebackend-fdo
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") ; webkit2gtk4 (name "webkitgtk")
(version "2.40.5") (version "2.42.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x")) (base32 "1qnq2f6chsfns1psrqbbsqhgyb458zf75nlmzskb6a2n0hq4c6ha"))
(patches (search-patches (patches (search-patches
"webkitgtk-adjust-bubblewrap-paths.patch")))) "webkitgtk-adjust-bubblewrap-paths.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -149,10 +149,8 @@ (define-public webkitgtk
#:build-type "Release" #:build-type "Release"
#:configure-flags #:configure-flags
#~(list "-DPORT=GTK" #~(list "-DPORT=GTK"
;; GTKDOC will be removed upstream soon in favor of "-DENABLE_INTROSPECTION=ON"
;; gi-docgen; it is normally disabled because the "-DUSE_GTK4=ON"
;; doc is rather expensive to build.
"-DENABLE_GTKDOC=ON"
;; The minibrowser, not built by default, is a good ;; The minibrowser, not built by default, is a good
;; tool to validate the good operation of ;; tool to validate the good operation of
;; webkitgtk. ;; webkitgtk.
@ -232,7 +230,7 @@ (define-public webkitgtk
ruby-2.7 ruby-2.7
unifdef)) unifdef))
(propagated-inputs (propagated-inputs
(list gtk+ libsoup)) (list gtk libsoup))
(inputs (inputs
(list at-spi2-core (list at-spi2-core
bubblewrap bubblewrap
@ -249,8 +247,8 @@ (define-public webkitgtk
libgcrypt libgcrypt
libgudev libgudev
libjpeg-turbo libjpeg-turbo
libjxl
libmanette libmanette
libnotify
libpng libpng
libseccomp libseccomp
libsecret libsecret
@ -283,34 +281,34 @@ (define-public webkitgtk
license:bsd-2 license:bsd-2
license:bsd-3)))) license:bsd-3))))
(define-public webkitgtk-next (define-public webkitgtk-for-gtk3
(package (package
(inherit webkitgtk) (inherit webkitgtk)
(name "webkitgtk-next") ; webkit2gtk5 (name "webkitgtk-for-gtk3")
(arguments (arguments
(substitute-keyword-arguments (package-arguments webkitgtk) (substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons* "-DENABLE_INTROSPECTION=ON" #~(cons* "-DENABLE_GTKDOC=ON"
"-DUSE_GTK4=ON" (delete "-DENABLE_INTROSPECTION=ON"
(delete "-DENABLE_GTKDOC=ON" #$flags))))) (delete "-DUSE_GTK4=ON" #$flags))))))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs webkitgtk) (modify-inputs (package-propagated-inputs webkitgtk)
(replace "gtk+" gtk))) (replace "gtk" gtk+)))
(inputs (inputs
(modify-inputs (package-inputs webkitgtk) (modify-inputs (package-inputs webkitgtk)
(delete "libnotify"))))) (prepend libnotify)))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; 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: ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218. ;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218.
(define-public webkitgtk-with-libsoup2 (define-public webkitgtk-with-libsoup2
(package/inherit webkitgtk (package/inherit webkitgtk-for-gtk3
(name "webkitgtk-with-libsoup2") (name "webkitgtk-with-libsoup2")
(arguments (substitute-keyword-arguments (package-arguments webkitgtk) (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3)
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons "-DUSE_SOUP2=ON" #$flags)))) #~(cons "-DUSE_SOUP2=ON" #$flags))))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs webkitgtk) (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3)
(replace "libsoup" libsoup-minimal-2))))) (replace "libsoup" libsoup-minimal-2)))))
(define-public wpewebkit (define-public wpewebkit