[PR PATCH] webkit2gtk: update to 2.40.3.

[PR PATCH] webkit2gtk: update to 2.40.3.

[magackame]

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

There is a new pull request by magackame against master on the void-packages repository

https://github.com/magackame/void-packages webkit2gtk-update-to-2.40.3
https://github.com/void-linux/void-packages/pull/44766

webkit2gtk: update to 2.40.3.
[ci skip]

Fixes `nyxt` package.

#### Testing the changes
- I tested the changes in this PR: **YES**

Tested `luakit` and `nyxt` packages - both work.

#### Local build testing
- [x] I built this PR locally for my native architecture, x86_64-glibc
- [ ] I built this PR locally for these architectures:
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l

All cross builds failed with:

```
CMake Error at Source/cmake/BubblewrapSandboxChecks.cmake:9 (message):
  bwrap executable version 0.3.1 or newer is needed for
  ENABLE_BUBBLEWRAP_SANDBOX.  Unable to autodetect the path when
  cross-compiling.  Please define define the CMake variable BWRAP_EXECUTABLE
  with the run-time full-path to the 'bwrap' program.
Call Stack (most recent call first):
  Source/cmake/OptionsGTK.cmake:573 (include)
  Source/cmake/WebKitCommon.cmake:227 (include)
  CMakeLists.txt:21 (include)


-- Configuring incomplete, errors occurred!
=> ERROR: webkit2gtk-2.40.3_1: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:76
```

Running `xbps-query -Rs bubble` shows:

```
[*] bubblewrap-0.8.0_1 Unprivileged sandboxing tool
[-] wmbubble-1.54_1    System monitoring dockapp, based on BubbleMon
```

Running `bwrap --version` shows:

```
bubblewrap 0.8.0
```

I don't know too much about CMake or xbps-src cross compiling could anyone help me?

A patch file from https://github.com/void-linux/void-packages/pull/44766.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-update-to-2.40.3-44766.patch --]
[-- Type: text/x-diff, Size: 1101 bytes --]

From e67e6a6f8114a8111df1195d2a7bf5953d3b2779 Mon Sep 17 00:00:00 2001
From: Andrey Hetman <magackame@gmail.com>
Date: Sat, 1 Jul 2023 18:53:10 +0300
Subject: [PATCH] webkit2gtk: update to 2.40.3.

---
 srcpkgs/webkit2gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 3894f64a2ffe..6732b498eae2 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.40.0
-revision=2
+version=2.40.3
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+checksum=cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd
 make_check=no # TODO
 
 replaces="webkit2gtk-common>0"

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616013189

Comment:
https://github.com/WebKit/WebKit/commit/7093bcb6d649597962c82fd0e9a92d329ba8fb48

You need to define `-DBWRAP_EXECUTABLE` and `-DDBUS_PROXY_EXECUTABLE`. (it should just be the normal /usr/bin path)

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616013189

Comment:
https://github.com/WebKit/WebKit/commit/7093bcb6d649597962c82fd0e9a92d329ba8fb48

You need to define `-DBWRAP_EXECUTABLE` and `-DDBUS_PROXY_EXECUTABLE` when cross compiling now. (it should just be the normal /usr/bin path)

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616013189

Comment:
https://github.com/WebKit/WebKit/commit/7093bcb6d649597962c82fd0e9a92d329ba8fb48

You need to define `-DBWRAP_EXECUTABLE` and `-DDBUS_PROXY_EXECUTABLE` when cross compiling now. (it should just be the normal /usr/bin path)

Also, you can test it using `/usr/libexec/webkit2gtk-<version>/MiniBrowser` or epiphany

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616013189

Comment:
https://github.com/WebKit/WebKit/commit/7093bcb6d649597962c82fd0e9a92d329ba8fb48

You need to define `-DBWRAP_EXECUTABLE` and `-DDBUS_PROXY_EXECUTABLE` when cross compiling now. (it should just be the normal /usr/bin path)

Also, you can test it using `/usr/libexec/webkit2gtk-<version>/MiniBrowser`.

Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.3.

[magackame]

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

There is an updated pull request by magackame against master on the void-packages repository

https://github.com/magackame/void-packages webkit2gtk-update-to-2.40.3
https://github.com/void-linux/void-packages/pull/44766

webkit2gtk: update to 2.40.3.
[ci skip]

Fixes `nyxt` package.

#### Testing the changes
- I tested the changes in this PR: **YES**

Tested `luakit` and `nyxt` packages - both work.

#### Local build testing
- [x] I built this PR locally for my native architecture, x86_64-glibc
- [ ] I built this PR locally for these architectures:
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l

All cross builds failed with:

```
CMake Error at Source/cmake/BubblewrapSandboxChecks.cmake:9 (message):
  bwrap executable version 0.3.1 or newer is needed for
  ENABLE_BUBBLEWRAP_SANDBOX.  Unable to autodetect the path when
  cross-compiling.  Please define define the CMake variable BWRAP_EXECUTABLE
  with the run-time full-path to the 'bwrap' program.
Call Stack (most recent call first):
  Source/cmake/OptionsGTK.cmake:573 (include)
  Source/cmake/WebKitCommon.cmake:227 (include)
  CMakeLists.txt:21 (include)


-- Configuring incomplete, errors occurred!
=> ERROR: webkit2gtk-2.40.3_1: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:76
```

Running `xbps-query -Rs bubble` shows:

```
[*] bubblewrap-0.8.0_1 Unprivileged sandboxing tool
[-] wmbubble-1.54_1    System monitoring dockapp, based on BubbleMon
```

Running `bwrap --version` shows:

```
bubblewrap 0.8.0
```

I don't know too much about CMake or xbps-src cross compiling could anyone help me?

A patch file from https://github.com/void-linux/void-packages/pull/44766.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-update-to-2.40.3-44766.patch --]
[-- Type: text/x-diff, Size: 1722 bytes --]

From 2e53b8883edef8ad3d8a04626148f63135037ae1 Mon Sep 17 00:00:00 2001
From: Andrey Hetman <magackame@gmail.com>
Date: Sat, 1 Jul 2023 18:53:10 +0300
Subject: [PATCH] webkit2gtk: update to 2.40.3.

---
 srcpkgs/webkit2gtk/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 3894f64a2ffe..4ff7f72c1509 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.40.0
-revision=2
+version=2.40.3
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
@@ -15,7 +15,9 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
  -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
- -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)
+ -DBWRAP_EXECUTABLE=/usr/bin/bwrap
+ -DDBUS_PROXY_EXECUTABLE=/usr/bin/xdg-dbus-proxy"
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
@@ -36,7 +38,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+checksum=cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd
 make_check=no # TODO
 
 replaces="webkit2gtk-common>0"

Re: webkit2gtk: update to 2.40.3.

[magackame]

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

New comment by magackame on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616160165

Comment:
I added the suggested options and now armv6l build works!

Updated the initial commit message.

Also, do I need to modify `common/shlibs` or anything else that I maybe missed?

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616175563

Comment:
> Also, do I need to modify `common/shlibs`?

Not unless a shlib was added or updated, which shouldn't be the case for patch versions.

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616175563

Comment:
> Also, do I need to modify `common/shlibs`?

Not unless a shlib was added or updated, which shouldn't be the case for micro version updates.

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616175563

Comment:
> Also, do I need to modify `common/shlibs`?

Not unless a shlib was added or updated (in an abi breaking way), which shouldn't be the case for micro version updates.

Re: webkit2gtk: update to 2.40.3.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1616175563

Comment:
> Also, do I need to modify `common/shlibs`?

Generally, not unless a shlib was added or bumped, which shouldn't be the case for micro version updates.

Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.3.

[magackame]

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

There is an updated pull request by magackame against master on the void-packages repository

https://github.com/magackame/void-packages webkit2gtk-update-to-2.40.3
https://github.com/void-linux/void-packages/pull/44766

webkit2gtk: update to 2.40.3.
[ci skip]

Fixes `nyxt` package.

#### Testing the changes
- I tested the changes in this PR: **YES**

Tested using `luakit`, `nyxt` and `/usr/libexec/webkit2gtk-4.0/MiniBrowser` - all works.

#### Local build testing
- [x] I built this PR locally for my native architecture, x86_64-glibc
- [x] I built this PR locally for these architectures:
  - [x] armv6l

A patch file from https://github.com/void-linux/void-packages/pull/44766.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-update-to-2.40.3-44766.patch --]
[-- Type: text/x-diff, Size: 1722 bytes --]

From d940711e86006c3e3b6348c3ab33dc90f2e777d7 Mon Sep 17 00:00:00 2001
From: Andrey Hetman <magackame@gmail.com>
Date: Sat, 1 Jul 2023 18:53:10 +0300
Subject: [PATCH] webkit2gtk: update to 2.40.3.

---
 srcpkgs/webkit2gtk/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 15e98aaca3b0..4ff7f72c1509 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.40.0
-revision=3
+version=2.40.3
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
@@ -15,7 +15,9 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
  -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
- -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)
+ -DBWRAP_EXECUTABLE=/usr/bin/bwrap
+ -DDBUS_PROXY_EXECUTABLE=/usr/bin/xdg-dbus-proxy"
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
@@ -36,7 +38,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+checksum=cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd
 make_check=no # TODO
 
 replaces="webkit2gtk-common>0"

Re: webkit2gtk: update to 2.40.3.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/44766#issuecomment-1747911564

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: webkit2gtk: update to 2.40.3.

[github-actions]

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

There's a closed pull request on the void-packages repository

webkit2gtk: update to 2.40.3.
https://github.com/void-linux/void-packages/pull/44766

Description:
[ci skip]

Fixes `nyxt` package.

#### Testing the changes
- I tested the changes in this PR: **YES**

Tested using `luakit`, `nyxt` and `/usr/libexec/webkit2gtk-4.0/MiniBrowser` - all works.

#### Local build testing
- [x] I built this PR locally for my native architecture, x86_64-glibc
- [x] I built this PR locally for these architectures:
  - [x] armv6l