Merge branch 'wip-webkit'

2024-11-07 15:36:20 -05:00 · 2023-12-18 09:29:48 +01:00 · 2023-12-18 09:29:48 +01:00 · f410d49eb2
commit f410d49eb2
parent e2d9a8eb14 256d5b3598
13 changed files with 46 additions and 47 deletions
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@ -529,7 +529,7 @@ (define-public gnome-maps
           libsoup
           libxml2
           rest-next
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (synopsis "Graphical map viewer and wayfinding program")
    (description "GNOME Maps is a graphical map viewer.  It uses map data from
 the OpenStreetMap project.  It can provide directions for walking, bicycling,
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@ -1666,7 +1666,7 @@ (define-public sushi
           libmusicbrainz
           libxml2
           neon
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (synopsis "File previewer for the GNOME desktop")
    (description "Sushi is a DBus-activated service that allows applications
 to preview files on the GNOME desktop.")
@ -3398,7 +3398,7 @@ (define-public cambalache
           python-pygobject
           python-lxml
           webkitgtk
-           webkitgtk-next))
+           webkitgtk))
    (native-inputs
     (list `(,glib "bin")
           gobject-introspection
@ -6175,7 +6175,7 @@ (define-public devhelp
           pkg-config))
    (inputs
     (list amtk
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (home-page "https://wiki.gnome.org/Apps/Devhelp")
    (synopsis "API documentation browser for GNOME")
    (description
@ -6188,7 +6188,7 @@ (define-public devhelp-with-libsoup2
  (hidden-package
   (package/inherit devhelp
     (inputs (modify-inputs (package-inputs devhelp)
-               (replace "webkitgtk" webkitgtk-with-libsoup2))))))
+               (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))))

 (define-public cogl
  (package
@ -7204,7 +7204,7 @@ (define-public epiphany
           libxslt
           nettle                       ; for hogweed
           sqlite
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (home-page "https://wiki.gnome.org/Apps/Web")
    (synopsis "GNOME web browser")
    (description
@ -7394,7 +7394,7 @@ (define-public yelp
           man-db                                 ;for URIs like "man:ls"
           groff-minimal                          ;ditto
           sqlite
-           webkitgtk
+           webkitgtk-for-gtk3
           yelp-xsl))
    (home-page "https://wiki.gnome.org/Apps/Yelp")
    (synopsis "GNOME help browser")
@ -8074,7 +8074,7 @@ (define-public gnome-online-accounts
           libsecret
           mit-krb5
           rest-next
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (synopsis "Single sign-on framework for GNOME")
    (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts")
    (description
@ -8107,7 +8107,7 @@ (define-public gnome-online-accounts-3.44
                      (delete 'disable-gtk-update-icon-cache)))))
    (inputs (modify-inputs (package-inputs gnome-online-accounts)
              (replace "rest" rest)
-              (replace "webkitgtk" webkitgtk-with-libsoup2)))))
+              (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))

 (define-public evolution-data-server
  (package
@ -8193,7 +8193,7 @@ (define-public evolution-data-server
           libphonenumber
           mit-krb5
           openldap
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (synopsis "Store address books and calendars")
    (home-page "https://wiki.gnome.org/Apps/Evolution")
    (description
@ -8220,7 +8220,7 @@ (define-public evolution-data-server-3.44
     (modify-inputs (package-inputs evolution-data-server)
       (replace "gnome-online-accounts" gnome-online-accounts-3.44)
       (replace "libgweather4" libgweather)
-       (replace "webkitgtk" webkitgtk-with-libsoup2)))
+       (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))
    (propagated-inputs
     (modify-inputs (package-propagated-inputs evolution-data-server)
       (delete "gtk")
@ -11317,7 +11317,7 @@ (define-public lollypop
           python-pygobject
           python-pylast
           totem-pl-parser
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (propagated-inputs
     (list gst-plugins-good             ;required to start lollypop
           gst-plugins-ugly))           ;required for streaming
@ -11786,7 +11786,7 @@ (define-public evolution
           libsoup
           nss
           openldap
-           webkitgtk
+           webkitgtk-for-gtk3
           ytnef))
    (home-page "https://gitlab.gnome.org/GNOME/evolution")
    (synopsis "Manage your email, contacts and schedule")
@ -12405,7 +12405,7 @@ (define-public gnome-boxes
           spice-gtk
           tracker
           vte
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (home-page "https://wiki.gnome.org/Apps/Boxes")
    (synopsis "View, access, and manage remote and virtual systems")
    (description "GNOME Boxes is a simple application to view, access, and
@ -12479,7 +12479,7 @@ (define-public geary
           libstemmer
           libunwind
           sqlite
-           webkitgtk
+           webkitgtk-for-gtk3
           ytnef))
    (native-inputs
     (list appstream-glib
@ -13178,7 +13178,7 @@ (define-public komikku
           python-rarfile
           python-requests
           python-unidecode
-           webkitgtk-next))
+           webkitgtk))
    (native-inputs
     (list desktop-file-utils
           gettext-minimal
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@ -3433,7 +3433,7 @@ (define-public guile-gi
                  (guix build utils)
                  (ice-9 popen)
                  (ice-9 rdelim))
-       #:disallowed-references ,(list gtk+ webkitgtk)
+       #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3)
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'remove-dotted-circle-from-combining-character
@ -3479,7 +3479,7 @@ (define-public guile-gi
    (propagated-inputs (list gobject-introspection))
    (inputs (list guile-3.0 glib
                  ;; For tests, only relevant when compiling natively
-                  gtk+ webkitgtk))
+                  gtk+ webkitgtk-for-gtk3))
    (home-page "https://github.com/spk121/guile-gi")
    (synopsis "GObject bindings for Guile")
    (description
@ -4018,7 +4018,7 @@ (define-public nomad
       ("glib-networking" ,glib-networking)
       ("gtk+" ,gtk+)
       ("gtk+:bin" ,gtk+ "bin")
-       ("webkitgtk" ,webkitgtk)
+       ("webkitgtk" ,webkitgtk-for-gtk3)
       ("gtksourceview" ,gtksourceview-4)
       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
       ("vte" ,vte)
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@ -5065,7 +5065,7 @@ (define-public sbcl-cl-webkit
    (inputs
     `(("cffi" ,sbcl-cffi)
       ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk-for-gtk3)))
    (native-inputs
     `(;; Tests seem to need Xorg.
       ;; ("xorg-server" ,xorg-server-for-tests)
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@ -3931,7 +3931,7 @@ (define-public balsa
           libsecret
           openldap
           sqlite
-           webkitgtk))
+           webkitgtk-for-gtk3))
    (native-inputs
     (list compface
           `(,glib "bin") intltool pkg-config yelp-tools))
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@ -775,7 +775,7 @@ (define-public atril
       ;;   Build libkpathsea as a shared library for DVI support.
       ;; ("libkpathsea" ,texlive-bin)
       ("poppler" ,poppler)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk-for-gtk3)))
    (home-page "https://mate-desktop.org")
    (synopsis "Document viewer for Mate")
    (description
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@ -578,7 +578,7 @@ (define-public ctrlr
             freetype
             libiberty
             libx11
-             webkitgtk))
+             webkitgtk-for-gtk3))
      (native-inputs
       (list pkg-config))
      (home-page "https://ctrlr.org/")
--- a/gnu/packages/rednotebook.scm
+++ b/gnu/packages/rednotebook.scm
@ -71,7 +71,8 @@ (define-public rednotebook
                 `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path)))
               #t))))))
    (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
    ;; dependencies, and remove them from rednotebook source:
    ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@ -597,7 +597,7 @@ (define-public gfeeds
           python-readability-lxml
           python-requests
           syndication-domination
-           webkitgtk-next))
+           webkitgtk))
    (home-page "https://gfeeds.gabmus.org/")
    (synopsis "Easy-to-use GTK+ RSS/Atom feed reader")
    (description "Feeds is an RSS/Atom feed reader made with GTK+
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@ -531,7 +531,7 @@ (define-public telegram-desktop
           rnnoise
           wayland
           wayland-protocols
-           webkitgtk
+           webkitgtk-for-gtk3
           webrtc-for-telegram-desktop
           xcb-util-keysyms
           xxhash
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@ -151,7 +151,7 @@ (define-public remmina
           telepathy-glib
           vte                          ; for st plugin
           wayland
-           webkitgtk                    ; for www plugin
+           webkitgtk-for-gtk3           ; for www plugin
           libx11
           libxext                      ; for xdmcp plugin
           xdg-utils
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@ -706,7 +706,7 @@ (define-public nyxt
                  gsettings-desktop-schemas
                  cl-gobject-introspection
                  gtk+                  ; For the main loop
-                  webkitgtk             ; Required when we use its typelib
+                  webkitgtk-for-gtk3    ; Required when we use its typelib
                  gobject-introspection
                  pkg-config))
    (synopsis "Extensible web-browser in Common Lisp")
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@ -126,14 +126,14 @@ (define-public wpebackend-fdo

 (define-public webkitgtk
  (package
-    (name "webkitgtk")                  ; webkit2gtk4
-    (version "2.40.5")
+    (name "webkitgtk")
+    (version "2.42.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.webkitgtk.org/releases/"
                                  name "-" version ".tar.xz"))
              (sha256
-               (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x"))
+               (base32 "1qnq2f6chsfns1psrqbbsqhgyb458zf75nlmzskb6a2n0hq4c6ha"))
              (patches (search-patches
                        "webkitgtk-adjust-bubblewrap-paths.patch"))))
    (build-system cmake-build-system)
@ -149,10 +149,8 @@ (define-public webkitgtk
      #:build-type "Release"
      #:configure-flags
      #~(list "-DPORT=GTK"
-              ;; GTKDOC will be removed upstream soon in favor of
-              ;; gi-docgen; it is normally disabled because the
-              ;; doc is rather expensive to build.
-              "-DENABLE_GTKDOC=ON"
+              "-DENABLE_INTROSPECTION=ON"
+              "-DUSE_GTK4=ON"
              ;; The minibrowser, not built by default, is a good
              ;; tool to validate the good operation of
              ;; webkitgtk.
@ -232,7 +230,7 @@ (define-public webkitgtk
           ruby-2.7
           unifdef))
    (propagated-inputs
-     (list gtk+ libsoup))
+     (list gtk libsoup))
    (inputs
     (list at-spi2-core
           bubblewrap
@ -249,8 +247,8 @@ (define-public webkitgtk
           libgcrypt
           libgudev
           libjpeg-turbo
+           libjxl
           libmanette
-           libnotify
           libpng
           libseccomp
           libsecret
@ -283,34 +281,34 @@ (define-public webkitgtk
                   license:bsd-2
                   license:bsd-3))))

-(define-public webkitgtk-next
+(define-public webkitgtk-for-gtk3
  (package
    (inherit webkitgtk)
-    (name "webkitgtk-next")             ; webkit2gtk5
+    (name "webkitgtk-for-gtk3")
    (arguments
     (substitute-keyword-arguments (package-arguments webkitgtk)
       ((#:configure-flags flags)
-        #~(cons* "-DENABLE_INTROSPECTION=ON"
-                 "-DUSE_GTK4=ON"
-                 (delete "-DENABLE_GTKDOC=ON" #$flags)))))
+        #~(cons* "-DENABLE_GTKDOC=ON"
+                 (delete "-DENABLE_INTROSPECTION=ON"
+                         (delete "-DUSE_GTK4=ON" #$flags))))))
    (propagated-inputs
     (modify-inputs (package-propagated-inputs webkitgtk)
-       (replace "gtk+" gtk)))
+       (replace "gtk" gtk+)))
    (inputs
     (modify-inputs (package-inputs webkitgtk)
-       (delete "libnotify")))))
+       (prepend libnotify)))))

 ;;; 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
+  (package/inherit webkitgtk-for-gtk3
    (name "webkitgtk-with-libsoup2")
-    (arguments (substitute-keyword-arguments (package-arguments webkitgtk)
+    (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3)
                 ((#:configure-flags flags)
                  #~(cons "-DUSE_SOUP2=ON" #$flags))))
    (propagated-inputs
-     (modify-inputs (package-propagated-inputs webkitgtk)
+     (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3)
       (replace "libsoup" libsoup-minimal-2)))))

 (define-public wpewebkit