From: pullmoll <pullmoll@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] webkit2gtk: fix bwrap-libdir32.patch
Date: Mon, 25 Jan 2021 09:40:26 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28214@inbox.vuxu.org> (raw)
[-- 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/28214
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/28214.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-28214.patch --]
[-- Type: text/x-diff, Size: 1830 bytes --]
From e4acaa5ef60be049961742033d2eeaad044561c5 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 strings resulting from LIB_DIR_WS concatenation are missing a slash.
---
srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch | 6 +++---
srcpkgs/webkit2gtk/template | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 1c83d3f4eb3..6324d5a483f 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -34,9 +34,9 @@ index 889388a..a7a75a8 100644
- "--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", "/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,
};
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"
next reply other threads:[~2021-01-25 8:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 8:40 pullmoll [this message]
2021-01-25 8:44 ` pullmoll
2021-01-25 8:44 ` [PR PATCH] [Closed]: " pullmoll
2021-01-25 8:46 ` pullmoll
2021-01-25 8:50 [PR PATCH] " pullmoll
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28214@inbox.vuxu.org \
--to=pullmoll@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).