I emptied the patch by error.

This commit is contained in:
sergiotarxz 2022-05-14 05:44:23 +02:00
parent a4e8aa0339
commit a207969cbe
2 changed files with 72 additions and 1 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=22.1.0
TERMUX_PKG_REVISION=16
TERMUX_PKG_REVISION=17
TERMUX_PKG_SRCURL=https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${TERMUX_PKG_VERSION}/xserver-xwayland-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=972d5456445049855a669c1418f20ecbc290c85b1b59602a01c6afa199203389
TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy, libxcvt, libtirpc"

View File

@ -0,0 +1,71 @@
diff --git a/Xext/shm.c b/Xext/shm.c
index 071bd1a41..8563c168e 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1207,9 +1207,9 @@ static int
shm_tmpfile(void)
{
const char *shmdirs[] = {
- "/run/shm",
- "/var/tmp",
- "/tmp",
+ "/data/data/me.sergiotarxz.openmg.x11/files/usr/run/shm",
+ "/data/data/me.sergiotarxz.openmg.x11/files/usr/var/tmp",
+ "/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp",
};
int fd;
diff --git a/os/connection.c b/os/connection.c
index 9e8d47f6b..e4363d654 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -993,7 +993,7 @@ ListenOnOpenFD(int fd, int noxauth)
XtransConnInfo ciptr;
const char *display_env = getenv("DISPLAY");
- if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
+ if (display_env && (strncmp(display_env, "/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp/launch", 11) == 0)) {
/* Make the path the launchd socket if our DISPLAY is set right */
strcpy(port, display_env);
}
diff --git a/os/utils.c b/os/utils.c
index c9a8e7367..9023ca172 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -232,7 +232,7 @@ OsSignal(int sig, OsSigHandlerPtr handler)
* server at a time. This keeps the servers from stomping on each other
* if the user forgets to give them different display numbers.
*/
-#define LOCK_DIR "/tmp"
+#define LOCK_DIR "/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp"
#define LOCK_TMP_PREFIX "/.tX"
#define LOCK_PREFIX "/.X"
#define LOCK_SUFFIX "-lock"
@@ -1673,7 +1673,7 @@ Win32TempDir(void)
else if (getenv("TMP") != NULL)
return getenv("TMP");
else
- return "/tmp";
+ return LOCK_DIR;
}
int
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index f9b7b06d9..c5355a8c2 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -77,12 +77,11 @@ OutputDirectory(char *outdir, size_t size)
directory = Win32TempDir();
pathsep = "\\";
#endif
-
if (directory)
r = snprintf(outdir, size, "%s%s", directory, pathsep);
if (r < 0 || r >= size) {
- assert(strlen("/tmp/") < size);
- strcpy(outdir, "/tmp/");
+ assert(strlen("/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp/") < size);
+ strcpy(outdir, "/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp/");
}
}