[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-webkitgtk-Update-to-2.36.1.patch --]
[-- Type: text/x-patch, Size: 1279 bytes --]

From b23c7db97f373dbe385e20eed0d415e9841dafa4 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 23 Apr 2022 17:07:38 +0800
Subject: [PATCH 1/2] gnu: webkitgtk: Update to 2.36.1.

* gnu/packages/webkit.scm (webkitgtk): Update to 2.36.1.
---
 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 476c33a1cd..5ebc62cfec 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -123,7 +123,7 @@ (define-public wpebackend-fdo
 engine that uses Wayland for graphics output.")
     (license license:bsd-2)))
 
-(define %webkit-version "2.36.0")
+(define %webkit-version "2.36.1")
 
 (define-public webkitgtk
   (package
@@ -134,7 +134,7 @@ (define-public webkitgtk
               (uri (string-append "https://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
-               (base32 "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq"))
+               (base32 "13qc5kqkjlh357fah97a04036ix0ab4lazb7h6cjl3yjn5gylj81"))
               (patches (search-patches
                         "webkitgtk-adjust-bubblewrap-paths.patch"))))
     (build-system cmake-build-system)
-- 
2.35.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-wpewebkit-Update-to-2.36.1.patch --]
[-- Type: text/x-patch, Size: 1000 bytes --]

From 9b758fece51fbf69eddb897cf8221ab252eac0a1 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 23 Apr 2022 17:08:34 +0800
Subject: [PATCH 2/2] gnu: wpewebkit: Update to 2.36.1.

* gnu/packages/webkit.scm (wpewebkit): Update to 2.36.1.
---
 gnu/packages/webkit.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 5ebc62cfec..9ee786124f 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -300,7 +300,7 @@ (define-public wpewebkit
               (uri (string-append "https://wpewebkit.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
-               (base32 "0nkdx6pckbkhs85z3pidnh4cbp0wfa38lf2qyn0grywvgpwajsh9"))))
+               (base32 "08spp864l1c6fvhg9rhg41qanxlq7c7l8s8djplrqiy3z2rdi0zc"))))
     (arguments
      (substitute-keyword-arguments (package-arguments webkitgtk)
        ((#:configure-flags flags)
-- 
2.35.1


[-- Attachment #4: Type: text/plain, Size: 100 bytes --]


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]


ping.
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]


ping again.

Zhu Zihao <all_but_last@163.com> writes:

> [[PGP Signed Part:Undecided]]
>
> ping.


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Jack Hill]

I tested this upgrade by building and running with a webkitgtk browser 
(vimb) on x86_64. I was able to browse a few pages without problems. This 
was with the libsoup2 variant. This, of course, doesn't test all the 
possible variations, but since this is a minor bugfix update, everything 
looks good to me and I think it is ready to be committed. Hopefully a 
committer will have time soon.

Best,
Jack

[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[Raghav Gururajan via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 364 bytes --]

@Zhu Zihao

Could you split the patch into two? One for webkitgtk update and another 
for wpewebkit update? Also, please generate the patches based-off of 
core-updates branch, instead of master branch.

Sorry for the delay and thanks for the patience.

I'll merge once I am done with #50537.


@Jack Hill

Thanks for the review. :)

Regards,
RG.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[Liliana Marie Prikler]

Am Dienstag, dem 10.05.2022 um 10:47 -0400 schrieb Raghav Gururajan:
> @Zhu Zihao
> 
> Could you split the patch into two? One for webkitgtk update and
> another for wpewebkit update? Also, please generate the patches
> based-off of core-updates branch, instead of master branch.
WPEWebkit inherits from WebkitGTK (at least on master), so it ought to
be done in the same patch.  For master, we should add the appropriate
grafts, since Webkit updates usually don't come without security
notices.

Cheers

[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[Raghav Gururajan via Guix-patches via]

Ah yes, thanks for pointing it out LilyP. Didn't notice the inheritance. Also, I'll look into the grafts for master.

Regards,
RG.
Sent from K-9 Mail, on Redmi Note 7 running LineageOS for MicroG with Magisk.

[bug#55078] [PATCH]: Update webkitgtk & wpewebkit to 2.36.1.

[Liliana Marie Prikler]

Am Donnerstag, dem 12.05.2022 um 08:23 +0530 schrieb Raghav Gururajan:
> Ah yes, thanks for pointing it out LilyP. Didn't notice the
> inheritance. Also, I'll look into the grafts for master.
Is this on the right branch yet?  There certainly are no grafts on
master currently.

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 130 bytes --]


ping again and again.
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Liliana Marie Prikler]

Am Montag, dem 06.06.2022 um 23:53 +0800 schrieb Zhu Zihao:
> ping again and again.
Last time Raghav reviewed this, they said to base it off of core-
updates.  Since 2.36.1 has security fixes, we should aim for master
instead, but use grafts (we can later ungraft on core-updates or a
dedicated branch).

Can you resend this as a grafting patch for master?

Thanks

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Jack Hill]

On Mon, 6 Jun 2022, Liliana Marie Prikler wrote:

> Am Montag, dem 06.06.2022 um 23:53 +0800 schrieb Zhu Zihao:
>> ping again and again.
> Last time Raghav reviewed this, they said to base it off of core-
> updates.  Since 2.36.1 has security fixes, we should aim for master
> instead, but use grafts (we can later ungraft on core-updates or a
> dedicated branch).
>
> Can you resend this as a grafting patch for master?
>
> Thanks

Is grafting really needed (I'm not confident I'm not adept enough with 
`git log` to tell for sure if we've done this before)?

I guess technically it should go via staging as `guix refresh -l 
webkitgtk` reports 359 dependent package to rebuild (which and additional 
75 from webkitgtk-with-libsoup2), but many of those are python packages 
which will presumably be fast rebuilds.

Also, WebKitGTK 2.36.3 is out: 
https://webkitgtk.org/2022/05/28/webkitgtk2.36.3-released.html

Best,
Jack

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Liliana Marie Prikler]

Am Montag, dem 06.06.2022 um 13:25 -0400 schrieb Jack Hill:
> On Mon, 6 Jun 2022, Liliana Marie Prikler wrote:
> 
> > Am Montag, dem 06.06.2022 um 23:53 +0800 schrieb Zhu Zihao:
> > > ping again and again.
> > Last time Raghav reviewed this, they said to base it off of core-
> > updates.  Since 2.36.1 has security fixes, we should aim for master
> > instead, but use grafts (we can later ungraft on core-updates or a
> > dedicated branch).
> > 
> > Can you resend this as a grafting patch for master?
> > 
> > Thanks
> 
> Is grafting really needed (I'm not confident I'm not adept enough
> with `git log` to tell for sure if we've done this before)?
Webkit is the base for a bunch of browsers.  Most of them are
lightweight compared to webkit itself, but still nasty to recompile.

> I guess technically it should go via staging as `guix refresh -l 
> webkitgtk` reports 359 dependent package to rebuild (which and
> additional 75 from webkitgtk-with-libsoup2), but many of those are
> python packages which will presumably be fast rebuilds.
Staging it is, then.  (Unless our security team says we should directly
push to master without a graft, which hasn't worked that well for us
last time.)

> Also, WebKitGTK 2.36.3 is out: 
> https://webkitgtk.org/2022/05/28/webkitgtk2.36.3-released.html
Yeah, let's do 2.36.3 then.

Cheers

[bug#55078] Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Liliana Marie Prikler]

Am Montag, dem 06.06.2022 um 20:24 +0200 schrieb Liliana Marie Prikler:
> Am Montag, dem 06.06.2022 um 13:25 -0400 schrieb Jack Hill:
> > Is grafting really needed (I'm not confident I'm not adept enough
> > with `git log` to tell for sure if we've done this before)?
> Webkit is the base for a bunch of browsers.  Most of them are
> lightweight compared to webkit itself, but still nasty to recompile.
With WebkitGTK currently having a spurious failure on CI, now wouldn't
be the worst time to ignore the usual grafting process, though.

bug#55078: Acknowledgement ([PATCH]: Update webkitgtk & wpewebkit to 2.36.1.)

[Liliana Marie Prikler]

Am Montag, dem 06.06.2022 um 13:25 -0400 schrieb Jack Hill:
> Is grafting really needed (I'm not confident I'm not adept enough
> with `git log` to tell for sure if we've done this before)?
> 
> I guess technically it should go via staging as `guix refresh -l 
> webkitgtk` reports 359 dependent package to rebuild
As staging was merged recently I went ahead and pushed 2.36.3 to
master.  This will cause slightly more rebuilds than necessary or
comfortable, but I cross my fingers that it'll be fine.

Cheers