[PR PATCH] webkit2gtk: fix bwrap-libdir32.patch

[PR PATCH] webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

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

https://github.com/pullmoll/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/28215

webkit2gtk: fix bwrap-libdir32.patch
The strings resulting from LIB_DIR_WS concatenation are missing a slash.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Not yet tested but I saw the wrong strings like `"/liblib64"` in an strace output.

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

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

From d6c46539d4aabf46ed109479e0745c00828302ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 09:37:13 +0100
Subject: [PATCH] webkit2gtk: fix bwrap-libdir32.patch

The LIB_DIR_WS string should be just the wordsize w/o "lib".
---
 srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch | 4 ++--
 srcpkgs/webkit2gtk/template                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 1c83d3f4eb3..32d540a84e1 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -19,9 +19,9 @@ index 889388a..a7a75a8 100644
          return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
  
 +#if __UINTPTR_MAX__ > 0xFFFFFFFF
-+#  define LIB_DIR_WS "lib64"
++#  define LIB_DIR_WS "64"
 +#else
-+#  define LIB_DIR_WS "lib32"
++#  define LIB_DIR_WS "32"
 +#endif
 +
      Vector<CString> sandboxArgs = {
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54762392d6a..9a6dae73f5a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.30.4
-revision=4
+revision=5
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

Re: webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/28215#issuecomment-766676102

Comment:
FWIW here is the list of parameters for `bwrap` from an straced run of `evolution` on my box:
```
--die-with-parent
--unshare-pid
--unshare-uts
--unshare-net
--ro-bind /etc /etc
--dev /dev
--proc /proc
--tmpfs /tmp
--unsetenv TMPDIR
--dir /run
--symlink ../run /var/run
--symlink ../tmp /var/tmp
--ro-bind /sys/block /sys/block
--ro-bind /sys/bus /sys/bus
--ro-bind /sys/class /sys/class
--ro-bind /sys/dev /sys/dev
--ro-bind /sys/devices /sys/devices
--ro-bind-try /usr/share /usr/share
--ro-bind-try /usr/local/share /usr/local/share
--ro-bind-try /usr/share /usr/share
--ro-bind-try /lib /lib
--ro-bind-try /usr/lib /usr/lib
--ro-bind-try /usr/local/lib /usr/local/lib
--ro-bind-try /usr/lib64 /usr/lib64
--ro-bind-try /liblib64 /liblib64
--ro-bind-try /usr/liblib64 /usr/liblib64
--ro-bind-try /usr/local/liblib64 /usr/local/liblib64
--ro-bind-try /usr/libexec/webkit2gtk-4.0 /usr/libexec/webkit2gtk-4.0
--ro-bind /usr/share/zoneinfo/Europe/Berlin /usr/share/zoneinfo/Europe/Berlin
--ro-bind-data 0032 /.flatpak-info
--bind-try /tmp/.X11-unix/X0 /tmp/.X11-unix/X0
--ro-bind-try /home/user/.Xauthority /home/user/.Xauthority
--ro-bind-try /usr/share/evolution/webkit /usr/share/evolution/webkit
--ro-bind-try /usr/lib/evolution/web-extensions /usr/lib/evolution/web-extensions
--bind-try /home/user/.cache/webkitgtk/applications /home/user/.cache/webkitgtk/applications
--bind-try /home/user/.local/share/webkitgtk/mediakeys /home/user/.local/share/webkitgtk/mediakeys
--bind-try /home/user/.local/share/webkitgtk/databases /home/user/.local/share/webkitgtk/databases
--bind-try /run/user/1000/pulse /run/user/1000/pulse
--ro-bind-try /home/user/.config/pulse /home/user/.config/pulse
--ro-bind-try /home/user/.pulse /home/user/.pulse
--ro-bind-try /home/user/.asoundrc /home/user/.asoundrc
--dev-bind-try /dev/snd /dev/snd
--bind-try /tmp/sndio /tmp/sndio
--bind-try /tmp/sndio-1000 /tmp/sndio-1000
--bind-try /home/user/.sndio /home/user/.sndio
--ro-bind-try /home/user/.config/fontconfig /home/user/.config/fontconfig
--ro-bind-try /home/user/.fontconfig /home/user/.fontconfig
--bind-try /home/user/.cache/fontconfig /home/user/.cache/fontconfig
--ro-bind-try /home/user/.fonts.conf /home/user/.fonts.conf
--ro-bind-try /home/user/.config/.fonts.conf.d /home/user/.config/.fonts.conf.d
--ro-bind-try /home/user/.local/share/fonts /home/user/.local/share/fonts
--ro-bind-try /home/user/.fonts /home/user/.fonts
--ro-bind-try /var/cache/fontconfig /var/cache/fontconfig
--ro-bind-try /home/user/.local/share/gstreamer-1.0 /home/user/.local/share/gstreamer-1.0
--bind-try /home/user/.cache/gstreamer-1.0 /home/user/.cache/gstreamer-1.0
--ro-bind-try /usr/libexec/gstreamer-1.0/gst-plugin-scanner /usr/libexec/gstreamer-1.0/gst-plugin-scanner
--ro-bind-try /usr/libexec/gst-install-plugins-helper /usr/libexec/gst-install-plugins-helper
--dev-bind-try /dev/dri /dev/dri
--dev-bind-try /dev/mali /dev/mali
--dev-bind-try /dev/mali0 /dev/mali0
--dev-bind-try /dev/umplock /dev/umplock
--dev-bind-try /dev/nvidiactl /dev/nvidiactl
--dev-bind-try /dev/nvidia0 /dev/nvidia0
--dev-bind-try /dev/nvidia /dev/nvidia
--dev-bind-try /dev/kgsl-3d0 /dev/kgsl-3d0
--dev-bind-try /dev/ion /dev/ion
--dev-bind-try /dev/v4l /dev/v4l
--dev-bind-try /dev/video0 /dev/video0
--dev-bind-try /dev/video1 /dev/video1
--ro-bind /run/user/1000/webkitgtk/dbus-proxy-GTICX0 /run/user/1000/webkitgtk/dbus-proxy-GTICX0
--setenv AT_SPI_BUS_ADDRESS unix:path=/run/user/1000/webkitgtk/dbus-proxy-GTICX0
--ro-bind-try /home/user/.config/gtk-3.0 /home/user/.config/gtk-3.0
--ro-bind-try /home/user/.local/share/themes /home/user/.local/share/themes
--ro-bind-try /home/user/.themes /home/user/.themes
--ro-bind-try /home/user/.icons /home/user/.icons
--seccomp 0034
```
Unfortunately evolution still prints the error `bwrap: execvp /usr/libexec/webkit2gtk-4.0/WebKitWebProcess: No such file or directory` after installing a local build of this PR :-(

Re: webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/28215#issuecomment-766676102

Comment:
FWIW here is the list of parameters for `bwrap` from an straced run of `evolution` on my box:
```
--die-with-parent
--unshare-pid
--unshare-uts
--unshare-net
--ro-bind /etc /etc
--dev /dev
--proc /proc
--tmpfs /tmp
--unsetenv TMPDIR
--dir /run
--symlink ../run /var/run
--symlink ../tmp /var/tmp
--ro-bind /sys/block /sys/block
--ro-bind /sys/bus /sys/bus
--ro-bind /sys/class /sys/class
--ro-bind /sys/dev /sys/dev
--ro-bind /sys/devices /sys/devices
--ro-bind-try /usr/share /usr/share
--ro-bind-try /usr/local/share /usr/local/share
--ro-bind-try /usr/share /usr/share
--ro-bind-try /lib /lib
--ro-bind-try /usr/lib /usr/lib
--ro-bind-try /usr/local/lib /usr/local/lib
--ro-bind-try /usr/lib64 /usr/lib64
--ro-bind-try /liblib64 /liblib64
--ro-bind-try /usr/liblib64 /usr/liblib64
--ro-bind-try /usr/local/liblib64 /usr/local/liblib64
--ro-bind-try /usr/libexec/webkit2gtk-4.0 /usr/libexec/webkit2gtk-4.0
--ro-bind /usr/share/zoneinfo/Europe/Berlin /usr/share/zoneinfo/Europe/Berlin
--ro-bind-data 0032 /.flatpak-info
--bind-try /tmp/.X11-unix/X0 /tmp/.X11-unix/X0
--ro-bind-try /home/user/.Xauthority /home/user/.Xauthority
--ro-bind-try /usr/share/evolution/webkit /usr/share/evolution/webkit
--ro-bind-try /usr/lib/evolution/web-extensions /usr/lib/evolution/web-extensions
--bind-try /home/user/.cache/webkitgtk/applications /home/user/.cache/webkitgtk/applications
--bind-try /home/user/.local/share/webkitgtk/mediakeys /home/user/.local/share/webkitgtk/mediakeys
--bind-try /home/user/.local/share/webkitgtk/databases /home/user/.local/share/webkitgtk/databases
--bind-try /run/user/1000/pulse /run/user/1000/pulse
--ro-bind-try /home/user/.config/pulse /home/user/.config/pulse
--ro-bind-try /home/user/.pulse /home/user/.pulse
--ro-bind-try /home/user/.asoundrc /home/user/.asoundrc
--dev-bind-try /dev/snd /dev/snd
--bind-try /tmp/sndio /tmp/sndio
--bind-try /tmp/sndio-1000 /tmp/sndio-1000
--bind-try /home/user/.sndio /home/user/.sndio
--ro-bind-try /home/user/.config/fontconfig /home/user/.config/fontconfig
--ro-bind-try /home/user/.fontconfig /home/user/.fontconfig
--bind-try /home/user/.cache/fontconfig /home/user/.cache/fontconfig
--ro-bind-try /home/user/.fonts.conf /home/user/.fonts.conf
--ro-bind-try /home/user/.config/.fonts.conf.d /home/user/.config/.fonts.conf.d
--ro-bind-try /home/user/.local/share/fonts /home/user/.local/share/fonts
--ro-bind-try /home/user/.fonts /home/user/.fonts
--ro-bind-try /var/cache/fontconfig /var/cache/fontconfig
--ro-bind-try /home/user/.local/share/gstreamer-1.0 /home/user/.local/share/gstreamer-1.0
--bind-try /home/user/.cache/gstreamer-1.0 /home/user/.cache/gstreamer-1.0
--ro-bind-try /usr/libexec/gstreamer-1.0/gst-plugin-scanner /usr/libexec/gstreamer-1.0/gst-plugin-scanner
--ro-bind-try /usr/libexec/gst-install-plugins-helper /usr/libexec/gst-install-plugins-helper
--dev-bind-try /dev/dri /dev/dri
--dev-bind-try /dev/mali /dev/mali
--dev-bind-try /dev/mali0 /dev/mali0
--dev-bind-try /dev/umplock /dev/umplock
--dev-bind-try /dev/nvidiactl /dev/nvidiactl
--dev-bind-try /dev/nvidia0 /dev/nvidia0
--dev-bind-try /dev/nvidia /dev/nvidia
--dev-bind-try /dev/kgsl-3d0 /dev/kgsl-3d0
--dev-bind-try /dev/ion /dev/ion
--dev-bind-try /dev/v4l /dev/v4l
--dev-bind-try /dev/video0 /dev/video0
--dev-bind-try /dev/video1 /dev/video1
--ro-bind /run/user/1000/webkitgtk/dbus-proxy-GTICX0 /run/user/1000/webkitgtk/dbus-proxy-GTICX0
--setenv AT_SPI_BUS_ADDRESS unix:path=/run/user/1000/webkitgtk/dbus-proxy-GTICX0
--ro-bind-try /home/user/.config/gtk-3.0 /home/user/.config/gtk-3.0
--ro-bind-try /home/user/.local/share/themes /home/user/.local/share/themes
--ro-bind-try /home/user/.themes /home/user/.themes
--ro-bind-try /home/user/.icons /home/user/.icons
--seccomp 0034
```
Unfortunately evolution still prints the error `bwrap: execvp /usr/libexec/webkit2gtk-4.0/WebKitWebProcess: No such file or directory` after installing a local build of this PR :-(
Need to build and verify that once more.

Re: webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/28215#issuecomment-766692084

Comment:
Ok, now it works: evolution is showing emails again.

Re: [PR PATCH] [Updated] webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

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

https://github.com/pullmoll/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/28215

webkit2gtk: fix bwrap-libdir32.patch
The LIB_DIR_WS string should be just the wordsize w/o "lib".

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Not yet tested but I saw the wrong strings like `"/liblib64"` in an strace output.

This github UI is annoyingly reluctant to updated commit msg etc. :)

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

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

From 8115001a7f73d64d07e1de8c4ad2eb170d9fd1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 09:37:13 +0100
Subject: [PATCH] webkit2gtk: fix bwrap-libdir32.patch

The LIB_DIR_WS string should be just the wordsize w/o "lib".

[ci skip]
---
 srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch | 4 ++--
 srcpkgs/webkit2gtk/template                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 1c83d3f4eb3..32d540a84e1 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -19,9 +19,9 @@ index 889388a..a7a75a8 100644
          return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
  
 +#if __UINTPTR_MAX__ > 0xFFFFFFFF
-+#  define LIB_DIR_WS "lib64"
++#  define LIB_DIR_WS "64"
 +#else
-+#  define LIB_DIR_WS "lib32"
++#  define LIB_DIR_WS "32"
 +#endif
 +
      Vector<CString> sandboxArgs = {
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54762392d6a..9a6dae73f5a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.30.4
-revision=4
+revision=5
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

Re: webkit2gtk: fix bwrap-libdir32.patch

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28215#issuecomment-766771626

Comment:
This looks like the correct fix to me, that very patch has
```diff
@@ -765,9 +771,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
         "--ro-bind-try", "/usr/lib", "/usr/lib",
         "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
         "--ro-bind-try", LIBDIR, LIBDIR,
-        "--ro-bind-try", "/lib64", "/lib64",
-        "--ro-bind-try", "/usr/lib64", "/usr/lib64",
-        "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
+        "--ro-bind-try", "/lib" LIB_DIR_WS, "/lib" LIB_DIR_WS,
+        "--ro-bind-try", "/usr/lib" LIB_DIR_WS, "/usr/lib" LIB_DIR_WS,
+        "--ro-bind-try", "/usr/local/lib" LIB_DIR_WS, "/usr/local/lib" LIB_DIR_WS,
 
         "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
     };
```

Re: webkit2gtk: fix bwrap-libdir32.patch

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/28215#issuecomment-766815346

Comment:
the patch is right, but it should not really fix the problem because the "proper" libdir is already handled specially via whatever is passed from cmake (you can see that in the output)

feel free to merge, though

Re: [PR PATCH] [Merged]: webkit2gtk: fix bwrap-libdir32.patch

[pullmoll]

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

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

webkit2gtk: fix bwrap-libdir32.patch
https://github.com/void-linux/void-packages/pull/28215

Description:
The LIB_DIR_WS string should be just the wordsize w/o "lib".

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Not yet tested but I saw the wrong strings like `"/liblib64"` in an strace output.

This github UI is annoyingly reluctant to updated commit msg etc. :)