wyj/gentoo-zh
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo-zh.git synced 2025-04-18 23:38:57 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

net-im/wechat-universal-bwrap: revbump, fix launcher script on openrc

Browse Source 
Also remove subslot operators in RDEPEND, because blobs cannot
actually be rebuilt when the package manager wants to.

Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
This commit is contained in:
WANG Xuerui 2024-04-07 21:03:31 +08:00 committed by 梁永祥
parent eb7aa1a608
commit 697636229b
2 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
net-im/wechat-universal-bwrap/files/adjust-launcher-fs-layout.patch
View File

@ -1,6 +1,8 @@
--- a/wechat-universal.sh 2024-04-05 18:50:38.878318940 +0800
+++ b/wechat-universal.sh 2024-04-06 20:44:53.128448547 +0800
@@ -80,11 +80,11 @@
diff --git a/wechat-universal.sh b/wechat-universal.sh
index 186c6b0..5e4f3f9 100644
--- a/wechat-universal.sh
+++ b/wechat-universal.sh
@@ -80,11 +80,11 @@ BWRAP_ARGS=(
# /usr
--ro-bind /usr{,}
@ -17,7 +19,14 @@
# /sandbox
--ro-bind /{usr/lib/flatpak-xdg-utils,sandbox}/xdg-open
@@ -105,6 +105,9 @@
@@ -99,12 +99,15 @@ BWRAP_ARGS=(
--proc /proc
# /etc
- --ro-bind /etc/machine-id{,}
+ --ro-bind-try /etc/machine-id{,}
--ro-bind /etc/passwd{,}
--ro-bind /etc/nsswitch.conf{,}
--ro-bind /etc/resolv.conf{,}
--ro-bind /etc/localtime{,}
--ro-bind-try /etc/fonts{,}
@ -27,3 +36,19 @@
# /sys
--dir /sys/dev # hack for Intel / AMD graphics, mesa calling virtual nodes needs /sys/dev being 0755
@@ -134,11 +137,11 @@ BWRAP_ARGS=(
--ro-bind-try "${HOME}/.local/share/.icons"{,}
# /run
- --dev-bind /run/dbus{,}
- --ro-bind /run/systemd/userdb{,}
+ --dev-bind-try /run/dbus{,}
+ --ro-bind-try /run/systemd/userdb{,}
--ro-bind-try "${XAUTHORITY}"{,}
- --ro-bind "${XDG_RUNTIME_DIR}/bus"{,}
- --ro-bind "${XDG_RUNTIME_DIR}/pulse"{,}
+ --ro-bind-try "${XDG_RUNTIME_DIR}/bus"{,}
+ --ro-bind-try "${XDG_RUNTIME_DIR}/pulse"{,}
)
exec bwrap "${BWRAP_ARGS[@]}" "${BWRAP_CUSTOM_BINDS[@]}" "${BWRAP_DEV_BINDS[@]}" "${BWRAP_ENV_APPEND[@]}" /opt/wechat-universal/wechat "$@"

62
net-im/wechat-universal-bwrap/wechat-universal-bwrap-1.0.0.238-r1.ebuild → net-im/wechat-universal-bwrap/wechat-universal-bwrap-1.0.0.238-r2.ebuild
View File

@ -27,37 +27,37 @@ RESTRICT="bindist strip mirror"
#
# objdump -p /path/weixin | grep NEEDED | awk '{print $2}' | xargs equery b | sort | uniq
BLOB_RDEPEND="
app-accessibility/at-spi2-core:2=
dev-libs/expat:=
dev-libs/glib:2=
dev-libs/nspr:=
dev-libs/nss:=
dev-libs/openssl-compat:1.1.1=
dev-libs/wayland:=
media-libs/alsa-lib:=
media-libs/fontconfig:=
media-libs/freetype:=
media-libs/libglvnd:=
media-libs/mesa:=
media-libs/tiff-compat:4=
sys-apps/dbus:=
sys-libs/zlib:=
x11-libs/cairo:=
x11-libs/libdrm:=
x11-libs/libX11:=
x11-libs/libxcb:=
x11-libs/libXcomposite:=
x11-libs/libXdamage:=
x11-libs/libXext:=
x11-libs/libXfixes:=
x11-libs/libxkbcommon:=
x11-libs/libXrandr:=
x11-libs/libXrender:=
x11-libs/pango:=
x11-libs/xcb-util-image:=
x11-libs/xcb-util-keysyms:=
x11-libs/xcb-util-renderutil:=
x11-libs/xcb-util-wm:=
app-accessibility/at-spi2-core:2
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
dev-libs/openssl-compat:1.1.1
dev-libs/wayland
media-libs/alsa-lib
media-libs/fontconfig
media-libs/freetype
media-libs/libglvnd
media-libs/mesa
media-libs/tiff-compat:4
sys-apps/dbus
sys-libs/zlib
x11-libs/cairo
x11-libs/libdrm
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/pango
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
"
RDEPEND="