From 887a8ce2dd4de4fc708ad976937686923d2fec4a Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sun, 19 May 2019 00:55:54 +0300 Subject: [PATCH] xtrans: update to 1.4.0 --- x11-packages/xtrans/build.sh | 5 +-- .../xtrans/xtrans-1.3.5_Xtranssock.c.patch | 44 ------------------- ...c.patch => xtrans-1.4.0_Xtranslcl.c.patch} | 28 ++++++------ .../xtrans/xtrans-1.4.0_Xtranssock.c.patch | 32 ++++++++++++++ 4 files changed, 48 insertions(+), 61 deletions(-) delete mode 100644 x11-packages/xtrans/xtrans-1.3.5_Xtranssock.c.patch rename x11-packages/xtrans/{xtrans-1.3.5_Xtranslcl.c.patch => xtrans-1.4.0_Xtranslcl.c.patch} (59%) create mode 100644 x11-packages/xtrans/xtrans-1.4.0_Xtranssock.c.patch diff --git a/x11-packages/xtrans/build.sh b/x11-packages/xtrans/build.sh index 2d1fcf81a..736a6712b 100644 --- a/x11-packages/xtrans/build.sh +++ b/x11-packages/xtrans/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X transport library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.3.5 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=1.4.0 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/xtrans-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 +TERMUX_PKG_SHA256=377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 TERMUX_PKG_NO_DEVELSPLIT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/x11-packages/xtrans/xtrans-1.3.5_Xtranssock.c.patch b/x11-packages/xtrans/xtrans-1.3.5_Xtranssock.c.patch deleted file mode 100644 index 7e179a306..000000000 --- a/x11-packages/xtrans/xtrans-1.3.5_Xtranssock.c.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -uNr xtrans-1.3.5/Xtranssock.c xtrans-1.3.5.mod/Xtranssock.c ---- xtrans-1.3.5/Xtranssock.c 2014-09-12 21:32:47.000000000 +0300 -+++ xtrans-1.3.5.mod/Xtranssock.c 2018-06-15 19:11:49.445727641 +0300 -@@ -208,28 +208,28 @@ - - - #if defined(X11_t) --#define UNIX_PATH "/tmp/.X11-unix/X" --#define UNIX_DIR "/tmp/.X11-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.X11-unix/X" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.X11-unix" - #endif /* X11_t */ - #if defined(XIM_t) --#define UNIX_PATH "/tmp/.XIM-unix/XIM" --#define UNIX_DIR "/tmp/.XIM-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.XIM-unix/XIM" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.XIM-unix" - #endif /* XIM_t */ - #if defined(FS_t) || defined(FONT_t) --#define UNIX_PATH "/tmp/.font-unix/fs" --#define UNIX_DIR "/tmp/.font-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.font-unix/fs" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.font-unix" - #endif /* FS_t || FONT_t */ - #if defined(ICE_t) --#define UNIX_PATH "/tmp/.ICE-unix/" --#define UNIX_DIR "/tmp/.ICE-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.ICE-unix/" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.ICE-unix" - #endif /* ICE_t */ - #if defined(TEST_t) --#define UNIX_PATH "/tmp/.Test-unix/test" --#define UNIX_DIR "/tmp/.Test-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.Test-unix/test" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.Test-unix" - #endif - #if defined(LBXPROXY_t) --#define UNIX_PATH "/tmp/.X11-unix/X" --#define UNIX_DIR "/tmp/.X11-unix" -+#define UNIX_PATH "/data/data/com.termux/files/usr/tmp/.X11-unix/X" -+#define UNIX_DIR "/data/data/com.termux/files/usr/tmp/.X11-unix" - #endif - - diff --git a/x11-packages/xtrans/xtrans-1.3.5_Xtranslcl.c.patch b/x11-packages/xtrans/xtrans-1.4.0_Xtranslcl.c.patch similarity index 59% rename from x11-packages/xtrans/xtrans-1.3.5_Xtranslcl.c.patch rename to x11-packages/xtrans/xtrans-1.4.0_Xtranslcl.c.patch index 479876066..e15093c28 100644 --- a/x11-packages/xtrans/xtrans-1.3.5_Xtranslcl.c.patch +++ b/x11-packages/xtrans/xtrans-1.4.0_Xtranslcl.c.patch @@ -1,57 +1,57 @@ -diff -uNr xtrans-1.3.5/Xtranslcl.c xtrans-1.3.5.mod/Xtranslcl.c ---- xtrans-1.3.5/Xtranslcl.c 2014-09-12 21:32:47.000000000 +0300 -+++ xtrans-1.3.5.mod/Xtranslcl.c 2018-06-15 19:11:42.979061153 +0300 +diff -uNr xtrans-1.4.0/Xtranslcl.c xtrans-1.4.0.mod/Xtranslcl.c +--- xtrans-1.4.0/Xtranslcl.c 2019-03-16 23:30:31.000000000 +0200 ++++ xtrans-1.4.0.mod/Xtranslcl.c 2019-05-19 00:54:20.390433328 +0300 @@ -250,7 +250,7 @@ #ifndef X11_t #define X_STREAMS_DIR "/dev/X" #else -#define X_STREAMS_DIR "/tmp/.X11-pipe" -+#define X_STREAMS_DIR "/data/data/com.termux/files/usr/tmp/.X11-pipe" ++#define X_STREAMS_DIR "@TERMUX_PREFIX@/tmp/.X11-pipe" #endif #endif @@ -260,7 +260,7 @@ #define PTSNODENAME "/dev/X/server." - #ifdef sun + #ifdef __sun -#define NAMEDNODENAME "/tmp/.X11-pipe/X" -+#define NAMEDNODENAME "/data/data/com.termux/files/usr/tmp/.X11-pipe/X" ++#define NAMEDNODENAME "@TERMUX_PREFIX@/tmp/.X11-pipe/X" #else #define NAMEDNODENAME "/dev/X/Nserver." @@ -270,7 +270,7 @@ #endif #if defined(XIM_t) - #ifdef sun + #ifdef __sun -#define NAMEDNODENAME "/tmp/.XIM-pipe/XIM" -+#define NAMEDNODENAME "/data/data/com.termux/files/usr/tmp/.XIM-pipe/XIM" ++#define NAMEDNODENAME "@TERMUX_PREFIX@/tmp/.XIM-pipe/XIM" #else #define PTSNODENAME "/dev/X/XIM." #define NAMEDNODENAME "/dev/X/NXIM." @@ -280,7 +280,7 @@ #endif #if defined(FS_t) || defined (FONT_t) - #ifdef sun + #ifdef __sun -#define NAMEDNODENAME "/tmp/.font-pipe/fs" -+#define NAMEDNODENAME "/data/data/com.termux/files/usr/tmp/.font-pipe/fs" ++#define NAMEDNODENAME "@TERMUX_PREFIX@/tmp/.font-pipe/fs" #else /* * USL has already defined something here. We need to check with them @@ -294,7 +294,7 @@ #endif #if defined(ICE_t) - #ifdef sun + #ifdef __sun -#define NAMEDNODENAME "/tmp/.ICE-pipe/" -+#define NAMEDNODENAME "/data/data/com.termux/files/usr/tmp/.ICE-pipe/" ++#define NAMEDNODENAME "@TERMUX_PREFIX@/tmp/.ICE-pipe/" #else #define PTSNODENAME "/dev/X/ICE." #define NAMEDNODENAME "/dev/X/NICE." @@ -304,7 +304,7 @@ #endif #if defined(TEST_t) - #ifdef sun + #ifdef __sun -#define NAMEDNODENAME "/tmp/.Test-unix/test" -+#define NAMEDNODENAME "/data/data/com.termux/files/usr/tmp/.Test-unix/test" ++#define NAMEDNODENAME "@TERMUX_PREFIX@/tmp/.Test-unix/test" #endif #define PTSNODENAME "/dev/X/transtest." #define NAMEDNODENAME "/dev/X/Ntranstest." diff --git a/x11-packages/xtrans/xtrans-1.4.0_Xtranssock.c.patch b/x11-packages/xtrans/xtrans-1.4.0_Xtranssock.c.patch new file mode 100644 index 000000000..d6046f44c --- /dev/null +++ b/x11-packages/xtrans/xtrans-1.4.0_Xtranssock.c.patch @@ -0,0 +1,32 @@ +diff -uNr xtrans-1.4.0/Xtranssock.c xtrans-1.4.0.mod/Xtranssock.c +--- xtrans-1.4.0/Xtranssock.c 2019-03-16 23:30:31.000000000 +0200 ++++ xtrans-1.4.0.mod/Xtranssock.c 2019-05-19 00:52:00.404623112 +0300 +@@ -200,20 +200,20 @@ + + + #if defined(X11_t) +-#define UNIX_PATH "/tmp/.X11-unix/X" +-#define UNIX_DIR "/tmp/.X11-unix" ++#define UNIX_PATH "@TERMUX_PREFIX@/tmp/.X11-unix/X" ++#define UNIX_DIR "@TERMUX_PREFIX@/tmp/.X11-unix" + #endif /* X11_t */ + #if defined(XIM_t) +-#define UNIX_PATH "/tmp/.XIM-unix/XIM" +-#define UNIX_DIR "/tmp/.XIM-unix" ++#define UNIX_PATH "@TERMUX_PREFIX@/tmp/.XIM-unix/XIM" ++#define UNIX_DIR "@TERMUX_PREFIX@/tmp/.XIM-unix" + #endif /* XIM_t */ + #if defined(FS_t) || defined(FONT_t) +-#define UNIX_PATH "/tmp/.font-unix/fs" +-#define UNIX_DIR "/tmp/.font-unix" ++#define UNIX_PATH "@TERMUX_PREFIX@/tmp/.font-unix/fs" ++#define UNIX_DIR "@TERMUX_PREFIX@/tmp/.font-unix" + #endif /* FS_t || FONT_t */ + #if defined(ICE_t) +-#define UNIX_PATH "/tmp/.ICE-unix/" +-#define UNIX_DIR "/tmp/.ICE-unix" ++#define UNIX_PATH "@TERMUX_PREFIX@/tmp/.ICE-unix/" ++#define UNIX_DIR "@TERMUX_PREFIX@/tmp/.ICE-unix" + #endif /* ICE_t */ + +