mirror of
https://github.com/termux/termux-packages.git
synced 2025-05-11 16:43:53 +00:00
4a72152f78
- See https://github.com/termux/termux-packages/pull/24215#issuecomment-2788227037 - Replaces all instances of `export PATH="$TERMUX_PREFIX/opt/libwayland/cross/bin:$PATH"` and `wayland-scanner` patches in reverse dependencies with `termux_setup_wayland_cross_pkg_config_wrapper` - Some packages were working because they were using `/usr/bin/wayland-scanner`, this changes all of them to use `$PREFIX/opt/libwayland/cross/bin/wayland-scanner` instead [no ci]
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
--- a/xwayland/launcher.c
|
|
+++ b/xwayland/launcher.c
|
|
@@ -78,9 +78,9 @@
|
|
{
|
|
char path[256];
|
|
|
|
- snprintf(path, sizeof path, "/tmp/.X%d-lock", wxs->display);
|
|
+ snprintf(path, sizeof path, "@TERMUX_PREFIX@/tmp/.X%d-lock", wxs->display);
|
|
unlink(path);
|
|
- snprintf(path, sizeof path, "/tmp/.X11-unix/X%d", wxs->display);
|
|
+ snprintf(path, sizeof path, "@TERMUX_PREFIX@/tmp/.X11-unix/X%d", wxs->display);
|
|
unlink(path);
|
|
if (wxs->client) {
|
|
wl_client_destroy(wxs->client);
|
|
@@ -111,7 +111,7 @@
|
|
|
|
addr.sun_family = AF_LOCAL;
|
|
name_size = snprintf(addr.sun_path, sizeof addr.sun_path,
|
|
- "%c/tmp/.X11-unix/X%d", 0, display);
|
|
+ "%c@TERMUX_PREFIX@/tmp/.X11-unix/X%d", 0, display);
|
|
size = offsetof(struct sockaddr_un, sun_path) + name_size;
|
|
if (bind(fd, (struct sockaddr *) &addr, size) < 0) {
|
|
weston_log("failed to bind to @%s: %s\n", addr.sun_path + 1,
|
|
@@ -141,7 +141,7 @@
|
|
|
|
addr.sun_family = AF_LOCAL;
|
|
name_size = snprintf(addr.sun_path, sizeof addr.sun_path,
|
|
- "/tmp/.X11-unix/X%d", display) + 1;
|
|
+ "@TERMUX_PREFIX@/tmp/.X11-unix/X%d", display) + 1;
|
|
size = offsetof(struct sockaddr_un, sun_path) + name_size;
|
|
unlink(addr.sun_path);
|
|
if (bind(fd, (struct sockaddr *) &addr, size) < 0) {
|
|
@@ -169,7 +169,7 @@
|
|
int fd, size;
|
|
pid_t other;
|
|
|
|
- snprintf(lockfile, lsize, "/tmp/.X%d-lock", display);
|
|
+ snprintf(lockfile, lsize, "@TERMUX_PREFIX@/tmp/.X%d-lock", display);
|
|
fd = open(lockfile, O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL, 0444);
|
|
if (fd < 0 && errno == EEXIST) {
|
|
fd = open(lockfile, O_CLOEXEC | O_RDONLY);
|