Fixing patch, this time hopefully for good.
This commit is contained in:
parent
88066ffdac
commit
a4e8aa0339
|
@ -1,67 +0,0 @@
|
||||||
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 6cefc02ac..e1e31b9aa 100644
|
|
||||||
--- a/os/utils.c
|
|
||||||
+++ b/os/utils.c
|
|
||||||
@@ -230,7 +230,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"
|
|
||||||
@@ -1650,7 +1650,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 ea7e34700..277e5221d 100644
|
|
||||||
--- a/xkb/ddxLoad.c
|
|
||||||
+++ b/xkb/ddxLoad.c
|
|
||||||
@@ -76,8 +76,8 @@ OutputDirectory(char *outdir, size_t size)
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
- if (strlen("/tmp/") < size) {
|
|
||||||
- (void) strcpy(outdir, "/tmp/");
|
|
||||||
+ if (strlen("/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp/") < size) {
|
|
||||||
+ (void) strcpy(outdir, "/data/data/me.sergiotarxz.openmg.x11/files/usr/tmp/");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue