Package: guix-patches;
Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Date: Thu, 12 Oct 2023 06:54:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66480 in the body.
You can then email your comments to 66480 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Thu, 12 Oct 2023 06:54:02 GMT) Full text and rfc822 format available.Liliana Marie Prikler <liliana.prikler <at> gmail.com>:liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org.
(Thu, 12 Oct 2023 06:54:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: guix-patches <at> gnu.org Subject: [PATCH gnome-team WIP 0/2] Update WebkitGTK Date: Thu, 12 Oct 2023 08:37:49 +0200
Hi Guix, our Webkit is a tad bit out of date, so let's at least update it on the gnome-team branch. Also, since we have a Webkit 6.0 typelib now, let's make it the default Webkit for everyone. What could go wrong? (hopefully this won't go like <https://qa.guix.gnu.org/issue/66019> where the CI refused to compute stuff) Liliana Marie Prikler (2): gnu: webkitgtk: Update to 2.42.1. gnu: Make webkitgtk-next the new webkitgtk. gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 24 ++++++++++++------------ gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 32 +++++++++++++++----------------- 13 files changed, 41 insertions(+), 42 deletions(-) base-commit: b701a7018d94aebef6a967ec235c72c1f7cdfe5c -- 2.41.0
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Thu, 12 Oct 2023 07:26:01 GMT) Full text and rfc822 format available.Message #8 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team WIP 1/2] gnu: webkitgtk: Update to 2.42.1. Date: Wed, 11 Oct 2023 22:24:37 +0200
* gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1.
[inputs]: Add libjxl.
---
gnu/packages/webkit.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0c82435cde..100875dd52 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -127,13 +127,13 @@ (define-public wpebackend-fdo
(define-public webkitgtk
(package
(name "webkitgtk") ; webkit2gtk4
- (version "2.40.5")
+ (version "2.42.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x"))
+ (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg"))
(patches (search-patches
"webkitgtk-adjust-bubblewrap-paths.patch"))))
(build-system cmake-build-system)
@@ -249,6 +249,7 @@ (define-public webkitgtk
libgcrypt
libgudev
libjpeg-turbo
+ libjxl
libmanette
libnotify
libpng
--
2.41.0
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Thu, 12 Oct 2023 07:26:02 GMT) Full text and rfc822 format available.Message #11 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team WIP 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Thu, 12 Oct 2023 08:25:26 +0200
As of version 2.42.0, the WebKit 6.0 typelib is considered stable.
With GNOME itself moving to GTK4 as time marches on, we should reflect
the fact that this is the preferred Webkit for future applications.
* gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic…
(webkitgtk): … here. Move old value …
(webkitgtk-for-gtk3): … here.
(webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3.
* gnu/packages/geo.scm (gnome-maps): Adjust accordingly.
* gnu/packages/gnome.scm (gnome-initial-setup, sushi)
(cambalache, devhelp, devhelp-with-libsoup2, evolution-data-server)
(evolution-data-server-3.44, lollypop, evolution, gnome-boxes)
(geary, komikku): Likewise.
* gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise.
* gnu/packages/mail.scm (balsa): Likewise.
* gnu/packages/mate.scm (atril): Likewise.
* gnu/packages/music.scm (ctrlr): Likewise.
* gnu/packages/rednotebook.scm (rednotebook): Likewise.
* gnu/packages/syndication.scm (gfeeds): Likewise.
* gnu/packages/telegram.scm (telegram-desktop): Likewise.
* gnu/packages/vnc.scm (remmina): Likewise.
* gnu/packages/web-browsers.scm (nyxt): Likewise.
---
gnu/packages/geo.scm | 2 +-
gnu/packages/gnome.scm | 24 ++++++++++++------------
gnu/packages/guile-xyz.scm | 6 +++---
gnu/packages/lisp-xyz.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/rednotebook.scm | 3 ++-
gnu/packages/syndication.scm | 2 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/vnc.scm | 2 +-
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/webkit.scm | 27 ++++++++++++---------------
13 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 3c238cd62a..bbf371a88c 100644
--- 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,
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bf853bd588..01d7e75890 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup
polkit
rest-next
upower
- webkitgtk-next))
+ webkitgtk))
(synopsis "Initial setup wizard for GNOME desktop")
(description "This package provides a set-up wizard when a
user logs into GNOME for the first time. It typically provides a
@@ -1665,7 +1665,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.")
@@ -3369,7 +3369,7 @@ (define-public cambalache
python-pygobject
python-lxml
webkitgtk
- webkitgtk-next))
+ webkitgtk))
(native-inputs
(list `(,glib "bin")
gobject-introspection
@@ -6130,7 +6130,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
@@ -6143,7 +6143,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
@@ -8155,7 +8155,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
@@ -8182,7 +8182,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")
@@ -11318,7 +11318,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
@@ -11787,7 +11787,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")
@@ -12406,7 +12406,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
@@ -12480,7 +12480,7 @@ (define-public geary
libstemmer
libunwind
sqlite
- webkitgtk
+ webkitgtk-for-gtk3
ytnef))
(native-inputs
(list appstream-glib
@@ -13179,7 +13179,7 @@ (define-public komikku
python-rarfile
python-requests
python-unidecode
- webkitgtk-next))
+ webkitgtk))
(native-inputs
(list desktop-file-utils
gettext-minimal
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fc52af4612..871d418bc2 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3350,7 +3350,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
@@ -3396,7 +3396,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
@@ -3935,7 +3935,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)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 5ba5c7d519..8cda1d00ab 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5039,7 +5039,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)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index be458a2d92..5e65ded3f2 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3915,7 +3915,7 @@ (define-public balsa
libsecret
openldap
sqlite
- webkitgtk))
+ webkitgtk-for-gtk3))
(native-inputs
(list compface
`(,glib "bin") intltool pkg-config yelp-tools))
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 5c3b4a265e..5a6c6b5b64 100644
--- 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
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6b19e9dde4..f6d418ce81 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -538,7 +538,7 @@ (define-public ctrlr
freetype
libiberty
libx11
- webkitgtk))
+ webkitgtk-for-gtk3))
(native-inputs
(list pkg-config))
(home-page "https://ctrlr.org/")
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm
index f63104ad32..a5dcc26efd 100644
--- 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
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index ac00d396b5..ea42c579cb 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -622,7 +622,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+
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index d3276cbe7c..af90fc35eb 100644
--- 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
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 8ba1292e28..7b39aba58d 100644
--- 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
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index d0b4e9f971..b5a29647bb 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -711,7 +711,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")
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 100875dd52..a374711119 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -126,7 +126,7 @@ (define-public wpebackend-fdo
(define-public webkitgtk
(package
- (name "webkitgtk") ; webkit2gtk4
+ (name "webkitgtk")
(version "2.42.1")
(source (origin
(method url-fetch)
@@ -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
@@ -251,7 +249,6 @@ (define-public webkitgtk
libjpeg-turbo
libjxl
libmanette
- libnotify
libpng
libseccomp
libsecret
@@ -284,28 +281,28 @@ (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)
((#:configure-flags flags)
--
2.41.0
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Thu, 12 Oct 2023 14:31:02 GMT) Full text and rfc822 format available.Message #14 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK Date: Thu, 12 Oct 2023 10:29:47 -0400
Hello, Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: > Hi Guix, > > our Webkit is a tad bit out of date, so let's at least update it on the > gnome-team branch. Also, since we have a Webkit 6.0 typelib now, let's > make it the default Webkit for everyone. What could go wrong? > > (hopefully this won't go like <https://qa.guix.gnu.org/issue/66019> where > the CI refused to compute stuff) > > Liliana Marie Prikler (2): > gnu: webkitgtk: Update to 2.42.1. > gnu: Make webkitgtk-next the new webkitgtk. I'm not too sure what Webkit 'typelib' means, but at any rate this looks reasonable to me (series LGTM). -- Thanks, Maxim
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Thu, 12 Oct 2023 16:39:01 GMT) Full text and rfc822 format available.Message #17 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK Date: Thu, 12 Oct 2023 18:37:32 +0200
Am Donnerstag, dem 12.10.2023 um 10:29 -0400 schrieb Maxim Cournoyer: > Hello, > > Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: > > > Hi Guix, > > > > our Webkit is a tad bit out of date, so let's at least update it on > > the gnome-team branch. Also, since we have a Webkit 6.0 typelib > > now, let's make it the default Webkit for everyone. What could go > > wrong? > > > > (hopefully this won't go like <https://qa.guix.gnu.org/issue/66019> > > where the CI refused to compute stuff) > > > > Liliana Marie Prikler (2): > > gnu: webkitgtk: Update to 2.42.1. > > gnu: Make webkitgtk-next the new webkitgtk. > > I'm not too sure what Webkit 'typelib' means, but at any rate this > looks reasonable to me (series LGTM). Put shortly, typelibs are annotated "C" libraries that you can use from many languages by consuming XML or reading a particularly formatted binary file. (See also gobject-introspection.) Basically, the move to Webkit 6.0 means that the GTK4 port of Webkit is now considered stable (6.0 means GTK, 5.x was GTK4 before, 4.1 is libsoup3, and 4.0 is libsoup2). Apparently, you can't really version- bump your dependencies without version-bumping your typelib so that downstream doesn't suddenly get hit by some API instability. Cheers
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Fri, 13 Oct 2023 03:39:01 GMT) Full text and rfc822 format available.Message #20 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team WIP 0/2] Update WebkitGTK Date: Thu, 12 Oct 2023 23:37:42 -0400
Hi, Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: > Am Donnerstag, dem 12.10.2023 um 10:29 -0400 schrieb Maxim Cournoyer: >> Hello, >> >> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: >> >> > Hi Guix, >> > >> > our Webkit is a tad bit out of date, so let's at least update it on >> > the gnome-team branch. Also, since we have a Webkit 6.0 typelib >> > now, let's make it the default Webkit for everyone. What could go >> > wrong? >> > >> > (hopefully this won't go like <https://qa.guix.gnu.org/issue/66019> >> > where the CI refused to compute stuff) >> > >> > Liliana Marie Prikler (2): >> > gnu: webkitgtk: Update to 2.42.1. >> > gnu: Make webkitgtk-next the new webkitgtk. >> >> I'm not too sure what Webkit 'typelib' means, but at any rate this >> looks reasonable to me (series LGTM). > Put shortly, typelibs are annotated "C" libraries that you can use from > many languages by consuming XML or reading a particularly formatted > binary file. (See also gobject-introspection.) > > Basically, the move to Webkit 6.0 means that the GTK4 port of Webkit is > now considered stable (6.0 means GTK, 5.x was GTK4 before, 4.1 is > libsoup3, and 4.0 is libsoup2). Apparently, you can't really version- > bump your dependencies without version-bumping your typelib so that > downstream doesn't suddenly get hit by some API instability. I see! Thanks for explaining. -- Thanks, Maxim
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Fri, 13 Oct 2023 18:49:01 GMT) Full text and rfc822 format available.Message #23 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team v2 1/2] gnu: webkitgtk: Update to 2.42.1. Date: Wed, 11 Oct 2023 22:24:37 +0200
* gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1.
[inputs]: Add libjxl.
---
gnu/packages/webkit.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0c82435cde..100875dd52 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -127,13 +127,13 @@ (define-public wpebackend-fdo
(define-public webkitgtk
(package
(name "webkitgtk") ; webkit2gtk4
- (version "2.40.5")
+ (version "2.42.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x"))
+ (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg"))
(patches (search-patches
"webkitgtk-adjust-bubblewrap-paths.patch"))))
(build-system cmake-build-system)
@@ -249,6 +249,7 @@ (define-public webkitgtk
libgcrypt
libgudev
libjpeg-turbo
+ libjxl
libmanette
libnotify
libpng
base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf
prerequisite-patch-id: 200a55f018acd42885dcb3cd10ec7b17524d8dd4
prerequisite-patch-id: dfca7d9abc3417513768cc76f3ed499dc255ae93
--
2.41.0
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Fri, 13 Oct 2023 18:49:02 GMT) Full text and rfc822 format available.Message #26 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Thu, 12 Oct 2023 08:25:26 +0200
As of version 2.42.0, the WebKit 6.0 typelib is considered stable.
With GNOME itself moving to GTK4 as time marches on, we should reflect
the fact that this is the preferred Webkit for future applications.
* gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic…
(webkitgtk): … here. Move old value …
(webkitgtk-for-gtk3): … here.
(webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3.
* gnu/packages/geo.scm (gnome-maps): Adjust accordingly.
* gnu/packages/gnome.scm (gnome-initial-setup, sushi)
(cambalache, devhelp, devhelp-with-libsoup2, evolution-data-server)
(evolution-data-server-3.44, lollypop, evolution, gnome-boxes)
(geary, komikku): Likewise.
* gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise.
* gnu/packages/mail.scm (balsa): Likewise.
* gnu/packages/mate.scm (atril): Likewise.
* gnu/packages/music.scm (ctrlr): Likewise.
* gnu/packages/rednotebook.scm (rednotebook): Likewise.
* gnu/packages/syndication.scm (gfeeds): Likewise.
* gnu/packages/telegram.scm (telegram-desktop): Likewise.
* gnu/packages/vnc.scm (remmina): Likewise.
* gnu/packages/web-browsers.scm (nyxt): Likewise.
---
gnu/packages/geo.scm | 2 +-
gnu/packages/gnome.scm | 24 ++++++++++++------------
gnu/packages/guile-xyz.scm | 6 +++---
gnu/packages/lisp-xyz.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/rednotebook.scm | 3 ++-
gnu/packages/syndication.scm | 2 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/vnc.scm | 2 +-
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/webkit.scm | 27 ++++++++++++---------------
13 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 3c238cd62a..bbf371a88c 100644
--- 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,
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fc2a6b24bd..c61fbcc295 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup
polkit
rest-next
upower
- webkitgtk-next))
+ webkitgtk))
(synopsis "Initial setup wizard for GNOME desktop")
(description "This package provides a set-up wizard when a
user logs into GNOME for the first time. It typically provides a
@@ -1665,7 +1665,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.")
@@ -3369,7 +3369,7 @@ (define-public cambalache
python-pygobject
python-lxml
webkitgtk
- webkitgtk-next))
+ webkitgtk))
(native-inputs
(list `(,glib "bin")
gobject-introspection
@@ -6130,7 +6130,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
@@ -6143,7 +6143,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
@@ -8155,7 +8155,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
@@ -8182,7 +8182,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")
@@ -11315,7 +11315,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
@@ -11784,7 +11784,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")
@@ -12400,7 +12400,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
@@ -12474,7 +12474,7 @@ (define-public geary
libstemmer
libunwind
sqlite
- webkitgtk
+ webkitgtk-for-gtk3
ytnef))
(native-inputs
(list appstream-glib
@@ -13173,7 +13173,7 @@ (define-public komikku
python-rarfile
python-requests
python-unidecode
- webkitgtk-next))
+ webkitgtk))
(native-inputs
(list desktop-file-utils
gettext-minimal
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fc52af4612..871d418bc2 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3350,7 +3350,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
@@ -3396,7 +3396,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
@@ -3935,7 +3935,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)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 5ba5c7d519..8cda1d00ab 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5039,7 +5039,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)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index be458a2d92..5e65ded3f2 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3915,7 +3915,7 @@ (define-public balsa
libsecret
openldap
sqlite
- webkitgtk))
+ webkitgtk-for-gtk3))
(native-inputs
(list compface
`(,glib "bin") intltool pkg-config yelp-tools))
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 5c3b4a265e..5a6c6b5b64 100644
--- 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
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6b19e9dde4..f6d418ce81 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -538,7 +538,7 @@ (define-public ctrlr
freetype
libiberty
libx11
- webkitgtk))
+ webkitgtk-for-gtk3))
(native-inputs
(list pkg-config))
(home-page "https://ctrlr.org/")
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm
index f63104ad32..a5dcc26efd 100644
--- 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
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index ac00d396b5..ea42c579cb 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -622,7 +622,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+
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index d3276cbe7c..af90fc35eb 100644
--- 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
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 8ba1292e28..7b39aba58d 100644
--- 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
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index d0b4e9f971..b5a29647bb 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -711,7 +711,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")
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 100875dd52..a374711119 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -126,7 +126,7 @@ (define-public wpebackend-fdo
(define-public webkitgtk
(package
- (name "webkitgtk") ; webkit2gtk4
+ (name "webkitgtk")
(version "2.42.1")
(source (origin
(method url-fetch)
@@ -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
@@ -251,7 +249,6 @@ (define-public webkitgtk
libjpeg-turbo
libjxl
libmanette
- libnotify
libpng
libseccomp
libsecret
@@ -284,28 +281,28 @@ (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)
((#:configure-flags flags)
--
2.41.0
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sat, 14 Oct 2023 13:10:02 GMT) Full text and rfc822 format available.Message #29 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Sat, 14 Oct 2023 09:08:58 -0400
Hi Liliana, The v2 series LGTM. Maxim
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sat, 14 Oct 2023 13:28:02 GMT) Full text and rfc822 format available.Message #32 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Sat, 14 Oct 2023 15:26:52 +0200
Am Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: > Hi Liliana, > > The v2 series LGTM. > > Maxim Hi Maxim, did you also attempt to build it? CI sadly doesn't and my personal machine doesn't like building Webkit :( Cheers
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sat, 14 Oct 2023 15:39:02 GMT) Full text and rfc822 format available.Message #35 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Sat, 14 Oct 2023 11:37:33 -0400
Hi, Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: > Am Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >> >> The v2 series LGTM. >> >> Maxim > Hi Maxim, > > did you also attempt to build it? CI sadly doesn't and my personal > machine doesn't like building Webkit :( I haven't tried building it, so I don't know! Why doesn't CI build it? Maxim
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sat, 14 Oct 2023 16:26:02 GMT) Full text and rfc822 format available.Message #38 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: rg <at> raghavgururajan.name, 66480 <at> debbugs.gnu.org Subject: Re: [bug#66480] [PATCH gnome-team v2 2/2] gnu: Make webkitgtk-next the new webkitgtk. Date: Sat, 14 Oct 2023 18:24:56 +0200
Am Samstag, dem 14.10.2023 um 11:37 -0400 schrieb Maxim Cournoyer: > Hi, > > Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes: > > > Am Samstag, dem 14.10.2023 um 09:08 -0400 schrieb Maxim Cournoyer: > > > Hi Liliana, > > > > > > The v2 series LGTM. > > > > > > Maxim > > Hi Maxim, > > > > did you also attempt to build it? CI sadly doesn't and my personal > > machine doesn't like building Webkit :( > > I haven't tried building it, so I don't know! Why doesn't CI build > it? > > Maxim Beats me; apparently it fails at applying the patch.
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sun, 15 Oct 2023 11:13:01 GMT) Full text and rfc822 format available.Message #41 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 66480 <at> debbugs.gnu.org Subject: Webkit update breaks gnome-online-accounts Date: Sun, 15 Oct 2023 13:12:26 +0200
Dear guix, I am excited to see new webkitgtks, but gnome-online-accounts now fails to build: ../gnome-online-accounts-3.48.0/meson.build:100:28: ERROR: Dependency "javascriptcoregtk-4.1" not found, tried pkgconfig Best regards, Vivien
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sun, 22 Oct 2023 10:43:01 GMT) Full text and rfc822 format available.Message #44 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. Date: Sun, 22 Oct 2023 12:35:21 +0200
* gnu/packages/gnome.scm (gnome-online-accounts): Likewise.
---
Dear guix,
You forgot to request webkitgtk-for-gtk3 for gnome-online-accounts. Here is a
formal fixup.
Best regards,
Vivien
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1edf6ccf5..a02d1a475a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8037,7 +8037,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
base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf
prerequisite-patch-id: 66465be264c2a9d61434147df12d649236de42fd
prerequisite-patch-id: c62b68675eca65ffc5a468d51f722fa849609111
prerequisite-patch-id: fcec6d4aa0e02f9cef07d44e6dbb2ea8664e89b2
--
2.41.0
guix-patches <at> gnu.org:bug#66480; Package guix-patches.
(Sun, 22 Oct 2023 13:07:01 GMT) Full text and rfc822 format available.Message #47 received at 66480 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 66480 <at> debbugs.gnu.org Subject: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. Date: Sun, 22 Oct 2023 15:01:25 +0200
---
Dear guix,
I was puzzled as to why webkitgtk-with-libsoup2 received -DUSE_GTK4=ON, when
it was strictly removed from its base, webkitgtk-for-gtk3. Now I know.
Best regards,
Vivien
gnu/packages/webkit.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index a374711119..7e0370abc0 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -304,11 +304,11 @@ (define-public webkitgtk-for-gtk3
(define-public webkitgtk-with-libsoup2
(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
base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf
prerequisite-patch-id: 66465be264c2a9d61434147df12d649236de42fd
prerequisite-patch-id: c62b68675eca65ffc5a468d51f722fa849609111
prerequisite-patch-id: fcec6d4aa0e02f9cef07d44e6dbb2ea8664e89b2
prerequisite-patch-id: 72cb2efc1b4a24f25196480972bddf0b4d78103a
--
2.41.0
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Message #52 received at 66480-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu>, 66480-done <at> debbugs.gnu.org Subject: Re: [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. Date: Mon, 23 Oct 2023 00:29:19 +0200
Am Sonntag, dem 22.10.2023 um 15:01 +0200 schrieb Vivien Kraus: > --- > Dear guix, > > I was puzzled as to why webkitgtk-with-libsoup2 received - > DUSE_GTK4=ON, when it was strictly removed from its base, webkitgtk- > for-gtk3. Now I know. Sorry, saw this too late. Pushed the series with the previous fixup but without this one. Added this one now. Marking as done, but feel free to reopen if this breaks builds. Cheers
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 20 Nov 2023 12:24:13 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.