From 2a807e88bab34b198c07c2a94c62ec3c67355263 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 12 Sep 2018 00:25:32 +0300 Subject: [PATCH] xorg-xvfb: update to 1.20.1 Now 'xorg-xvfb' depends on libmesa + libdrm. GLX extension is enabled too. --- x11-packages/tigervnc/build.sh | 7 ++-- x11-packages/xorg-xvfb/build.sh | 14 ++++---- ....19.1_hw_xfree86_common_xf86Config.c.patch | 12 ------- ..._xfree86_os-support_linux_lnx_acpi.c.patch | 12 ------- ...rver-1.19.1_hw_xfree86_parser_scan.c.patch | 12 ------- .../xorg-server-1.19.1_os_osinit.c.patch | 12 ------- ...1.20.1_hw_xfree86_common_compiler.h.patch} | 6 ++-- ....20.1_hw_xfree86_common_xf86Config.c.patch | 12 +++++++ ..._xfree86_os-support_linux_lnx_acpi.c.patch | 12 +++++++ ...rver-1.20.1_hw_xfree86_parser_scan.c.patch | 22 ++++++++++++ ..._xquartz_mach-startup_bundle-main.c.patch} | 6 ++-- ...-server-1.20.1_hw_xwin_InitOutput.c.patch} | 10 +++--- ...> xorg-server-1.20.1_include_site.h.patch} | 6 ++-- ...h => xorg-server-1.20.1_os_access.c.patch} | 6 ++-- ...> xorg-server-1.20.1_os_backtrace.c.patch} | 8 ++--- ... xorg-server-1.20.1_os_connection.c.patch} | 8 ++--- .../xorg-server-1.20.1_os_osinit.c.patch | 12 +++++++ ...ch => xorg-server-1.20.1_os_utils.c.patch} | 35 +++++++++---------- ...=> xorg-server-1.20.1_xkb_ddxLoad.c.patch} | 8 ++--- 19 files changed, 114 insertions(+), 106 deletions(-) delete mode 100644 x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_xf86Config.c.patch delete mode 100644 x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch delete mode 100644 x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_parser_scan.c.patch delete mode 100644 x11-packages/xorg-xvfb/xorg-server-1.19.1_os_osinit.c.patch rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_hw_xfree86_common_compiler.h.patch => xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch} (67%) create mode 100644 x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch create mode 100644 x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch create mode 100644 x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_hw_xquartz_mach-startup_bundle-main.c.patch => xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch} (66%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_hw_xwin_InitOutput.c.patch => xorg-server-1.20.1_hw_xwin_InitOutput.c.patch} (69%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_include_site.h.patch => xorg-server-1.20.1_include_site.h.patch} (57%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_os_access.c.patch => xorg-server-1.20.1_os_access.c.patch} (60%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_os_backtrace.c.patch => xorg-server-1.20.1_os_backtrace.c.patch} (55%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_os_connection.c.patch => xorg-server-1.20.1_os_connection.c.patch} (62%) create mode 100644 x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_os_utils.c.patch => xorg-server-1.20.1_os_utils.c.patch} (70%) rename x11-packages/xorg-xvfb/{xorg-server-1.19.1_xkb_ddxLoad.c.patch => xorg-server-1.20.1_xkb_ddxLoad.c.patch} (53%) diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh index d60c9a42d..45e6c9a46 100644 --- a/x11-packages/tigervnc/build.sh +++ b/x11-packages/tigervnc/build.sh @@ -2,12 +2,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/ TERMUX_PKG_VERSION=1.9.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC." TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740 -TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, fltk, libgcrypt, libgnutls, libjpeg-turbo, libpixman, libxdamage, libxfont2, libxshmfence, perl, xkeyboard-config, xorg-xauth, xorg-xvfb" +TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, fltk, libdrm, libgcrypt, libgnutls, libjpeg-turbo, libmesa, libpixman, libxdamage, libxfont2, libxshmfence, perl, xkeyboard-config, xorg-xauth, xorg-xvfb" TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xtrans" TERMUX_PKG_FOLDERNAME=tigervnc-${TERMUX_PKG_VERSION} @@ -20,12 +20,13 @@ termux_step_pre_configure () { cp -R ${TERMUX_TOPDIR}/xorg-xvfb/src/* ${TERMUX_PKG_BUILDDIR}/unix/xserver/ - patch -p1 -i ${TERMUX_PKG_SRCDIR}/unix/xserver119.patch + patch -p1 -i ${TERMUX_PKG_SRCDIR}/unix/xserver120.patch export ACLOCAL="aclocal -I ${TERMUX_PREFIX}/share/aclocal" autoreconf -fi CFLAGS="${CFLAGS} -DFNDELAY=O_NDELAY -DINITARGS=void" + CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm" LDFLAGS="${LDFLAGS} -llog" ./configure \ diff --git a/x11-packages/xorg-xvfb/build.sh b/x11-packages/xorg-xvfb/build.sh index 246576ca3..54ab5fc08 100644 --- a/x11-packages/xorg-xvfb/build.sh +++ b/x11-packages/xorg-xvfb/build.sh @@ -2,14 +2,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X virtual framebuffer" -TERMUX_PKG_VERSION=1.19.6 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_VERSION=1.20.1 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197 +TERMUX_PKG_SHA256=59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ---disable-libdrm ---disable-glx +--enable-glx --enable-composite --enable-mitshm --enable-xres @@ -59,12 +57,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb LIBS=-landroid-shmem" -TERMUX_PKG_DEPENDS="libandroid-shmem, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, openssl, xkeyboard-config, xorg-fonts-75dpi | xorg-fonts-100dpi, xorg-xkbcomp" +TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libmesa, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, openssl, xkeyboard-config, xorg-fonts-75dpi | xorg-fonts-100dpi, xorg-xkbcomp" TERMUX_PKG_CONFLICTS="xorg-server" TERMUX_PKG_REPLACES="xorg-server" termux_step_pre_configure () { - CFLAGS="${CFLAGS} -DFNDELAY=O_NDELAY" + CFLAGS+=" -DFNDELAY=O_NDELAY" + CPPFLAGS+=" -I${TERMUX_PREFIX}/include/libdrm" + if [ -n "${TERMUX_DEBUG}" ]; then TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug" fi diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_xf86Config.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_xf86Config.c.patch deleted file mode 100644 index 50275cea1..000000000 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_xf86Config.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr xorg-server-1.19.1/hw/xfree86/common/xf86Config.c xorg-server-1.19.1.mod/hw/xfree86/common/xf86Config.c ---- xorg-server-1.19.1/hw/xfree86/common/xf86Config.c 2017-01-05 23:19:31.000000000 +0200 -+++ xorg-server-1.19.1.mod/hw/xfree86/common/xf86Config.c 2017-11-24 18:44:44.652683647 +0200 -@@ -104,7 +104,7 @@ - #define SYS_CONFIGDIRPATH "%D/X11/%X" - #endif - #ifndef PROJECTROOT --#define PROJECTROOT "/usr/X11R6" -+#define PROJECTROOT "/data/data/com.termux/files/usr/X11R6" - #endif - - static ModuleDefault ModuleDefaults[] = { diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch deleted file mode 100644 index 22dce03bf..000000000 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr xorg-server-1.19.1/hw/xfree86/os-support/linux/lnx_acpi.c xorg-server-1.19.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c ---- xorg-server-1.19.1/hw/xfree86/os-support/linux/lnx_acpi.c 2017-01-04 23:27:52.000000000 +0200 -+++ xorg-server-1.19.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c 2017-11-24 18:44:44.662683772 +0200 -@@ -15,7 +15,7 @@ - #include - #include - --#define ACPI_SOCKET "/var/run/acpid.socket" -+#define ACPI_SOCKET "/data/data/com.termux/files/usr/var/run/acpid.socket" - - #define ACPI_VIDEO_NOTIFY_SWITCH 0x80 - #define ACPI_VIDEO_NOTIFY_PROBE 0x81 diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_parser_scan.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_parser_scan.c.patch deleted file mode 100644 index 39fb36618..000000000 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_parser_scan.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr xorg-server-1.19.1/hw/xfree86/parser/scan.c xorg-server-1.19.1.mod/hw/xfree86/parser/scan.c ---- xorg-server-1.19.1/hw/xfree86/parser/scan.c 2017-01-04 23:32:10.000000000 +0200 -+++ xorg-server-1.19.1.mod/hw/xfree86/parser/scan.c 2017-11-24 18:44:44.662683772 +0200 -@@ -552,7 +552,7 @@ - #define XCONFIGSUFFIX ".conf" - #endif - #ifndef PROJECTROOT --#define PROJECTROOT "/usr/X11R6" -+#define PROJECTROOT "/data/data/com.termux/files/usr/X11R6" - #endif - #ifndef SYSCONFDIR - #define SYSCONFDIR PROJECTROOT "/etc" diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_osinit.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_osinit.c.patch deleted file mode 100644 index b33674c89..000000000 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_osinit.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr xorg-server-1.19.1/os/osinit.c xorg-server-1.19.1.mod/os/osinit.c ---- xorg-server-1.19.1/os/osinit.c 2017-01-06 17:03:50.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/osinit.c 2017-11-24 18:44:44.672683897 +0200 -@@ -71,7 +71,7 @@ - #endif - - #ifndef ADMPATH --#define ADMPATH "/usr/adm/X%smsgs" -+#define ADMPATH "/data/data/com.termux/files/usr/adm/X%smsgs" - #endif - - extern char *display; diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_compiler.h.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch similarity index 67% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_compiler.h.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch index 0a494e65d..ad1cba316 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xfree86_common_compiler.h.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch @@ -1,6 +1,6 @@ -diff -uNr xorg-server-1.19.1/hw/xfree86/common/compiler.h xorg-server-1.19.1.mod/hw/xfree86/common/compiler.h ---- xorg-server-1.19.1/hw/xfree86/common/compiler.h 2017-01-05 23:19:31.000000000 +0200 -+++ xorg-server-1.19.1.mod/hw/xfree86/common/compiler.h 2017-11-24 18:44:44.652683647 +0200 +diff -uNr xorg-server-1.20.1/hw/xfree86/common/compiler.h xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h +--- xorg-server-1.20.1/hw/xfree86/common/compiler.h 2018-08-07 19:31:02.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h 2018-09-11 23:52:17.464825840 +0300 @@ -518,7 +518,7 @@ barrier(); } diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch new file mode 100644 index 000000000..a7231064c --- /dev/null +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch @@ -0,0 +1,12 @@ +diff -uNr xorg-server-1.20.1/hw/xfree86/common/xf86Config.c xorg-server-1.20.1.mod/hw/xfree86/common/xf86Config.c +--- xorg-server-1.20.1/hw/xfree86/common/xf86Config.c 2018-08-07 19:31:02.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xfree86/common/xf86Config.c 2018-09-11 23:52:17.464825840 +0300 +@@ -106,7 +106,7 @@ + #define SYS_CONFIGDIRPATH "%D/X11/%X" + #endif + #ifndef PROJECTROOT +-#define PROJECTROOT "/usr/X11R6" ++#define PROJECTROOT "/data/data/com.termux/files/usr/X11R6" + #endif + + static ModuleDefault ModuleDefaults[] = { diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch new file mode 100644 index 000000000..cb57bd922 --- /dev/null +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch @@ -0,0 +1,12 @@ +diff -uNr xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_acpi.c xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c +--- xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_acpi.c 2018-08-07 19:31:03.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c 2018-09-11 23:52:17.468159200 +0300 +@@ -15,7 +15,7 @@ + #include + #include + +-#define ACPI_SOCKET "/var/run/acpid.socket" ++#define ACPI_SOCKET "/data/data/com.termux/files/usr/var/run/acpid.socket" + + #define ACPI_VIDEO_NOTIFY_SWITCH 0x80 + #define ACPI_VIDEO_NOTIFY_PROBE 0x81 diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch new file mode 100644 index 000000000..5a98fc974 --- /dev/null +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch @@ -0,0 +1,22 @@ +diff -uNr xorg-server-1.20.1/hw/xfree86/parser/scan.c xorg-server-1.20.1.mod/hw/xfree86/parser/scan.c +--- xorg-server-1.20.1/hw/xfree86/parser/scan.c 2018-08-07 19:31:03.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xfree86/parser/scan.c 2018-09-11 23:57:04.337075807 +0300 +@@ -873,13 +873,13 @@ + */ + + #ifndef DEFAULT_CONF_PATH +-#define DEFAULT_CONF_PATH "/etc/X11/%S," \ ++#define DEFAULT_CONF_PATH "@TERMUX_PREFIX@/etc/X11/%S," \ + "%P/etc/X11/%S," \ +- "/etc/X11/%G," \ ++ "@TERMUX_PREFIX@/etc/X11/%G," \ + "%P/etc/X11/%G," \ +- "/etc/X11/%X-%M," \ +- "/etc/X11/%X," \ +- "/etc/%X," \ ++ "@TERMUX_PREFIX@/etc/X11/%X-%M," \ ++ "@TERMUX_PREFIX@/etc/X11/%X," \ ++ "@TERMUX_PREFIX@/etc/%X," \ + "%P/etc/X11/%X.%H," \ + "%P/etc/X11/%X-%M," \ + "%P/etc/X11/%X," \ diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xquartz_mach-startup_bundle-main.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch similarity index 66% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xquartz_mach-startup_bundle-main.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch index 1cfd70903..bf142b479 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xquartz_mach-startup_bundle-main.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch @@ -1,6 +1,6 @@ -diff -uNr xorg-server-1.19.1/hw/xquartz/mach-startup/bundle-main.c xorg-server-1.19.1.mod/hw/xquartz/mach-startup/bundle-main.c ---- xorg-server-1.19.1/hw/xquartz/mach-startup/bundle-main.c 2016-07-21 00:18:40.000000000 +0300 -+++ xorg-server-1.19.1.mod/hw/xquartz/mach-startup/bundle-main.c 2017-11-24 18:46:02.443657380 +0200 +diff -uNr xorg-server-1.20.1/hw/xquartz/mach-startup/bundle-main.c xorg-server-1.20.1.mod/hw/xquartz/mach-startup/bundle-main.c +--- xorg-server-1.20.1/hw/xquartz/mach-startup/bundle-main.c 2018-08-07 19:31:04.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xquartz/mach-startup/bundle-main.c 2018-09-11 23:52:17.468159200 +0300 @@ -79,7 +79,7 @@ #define DEFAULT_CLIENT X11BINDIR "/xterm" diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xwin_InitOutput.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch similarity index 69% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xwin_InitOutput.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch index 17f9eba4a..16bf07dfb 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_hw_xwin_InitOutput.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch @@ -1,7 +1,7 @@ -diff -uNr xorg-server-1.19.1/hw/xwin/InitOutput.c xorg-server-1.19.1.mod/hw/xwin/InitOutput.c ---- xorg-server-1.19.1/hw/xwin/InitOutput.c 2017-01-05 23:19:31.000000000 +0200 -+++ xorg-server-1.19.1.mod/hw/xwin/InitOutput.c 2017-11-24 18:44:44.662683772 +0200 -@@ -294,7 +294,7 @@ +diff -uNr xorg-server-1.20.1/hw/xwin/InitOutput.c xorg-server-1.20.1.mod/hw/xwin/InitOutput.c +--- xorg-server-1.20.1/hw/xwin/InitOutput.c 2018-08-07 19:31:04.000000000 +0300 ++++ xorg-server-1.20.1.mod/hw/xwin/InitOutput.c 2018-09-11 23:52:17.478159278 +0300 +@@ -285,7 +285,7 @@ level = none, curlevel; BOOL binary = TRUE; @@ -10,7 +10,7 @@ diff -uNr xorg-server-1.19.1/hw/xwin/InitOutput.c xorg-server-1.19.1.mod/hw/xwin if (mnt == NULL) { ErrorF("setmntent failed"); return; -@@ -303,7 +303,7 @@ +@@ -294,7 +294,7 @@ while ((ent = getmntent(mnt)) != NULL) { BOOL sys = (winCheckMntOpt(ent, "user") != NULL); BOOL root = (strcmp(ent->mnt_dir, "/") == 0); diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_include_site.h.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_include_site.h.patch similarity index 57% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_include_site.h.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_include_site.h.patch index 30ab509b1..08707a0fd 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_include_site.h.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_include_site.h.patch @@ -1,6 +1,6 @@ -diff -uNr xorg-server-1.19.1/include/site.h xorg-server-1.19.1.mod/include/site.h ---- xorg-server-1.19.1/include/site.h 2017-01-04 23:28:03.000000000 +0200 -+++ xorg-server-1.19.1.mod/include/site.h 2017-11-24 18:44:44.672683897 +0200 +diff -uNr xorg-server-1.20.1/include/site.h xorg-server-1.20.1.mod/include/site.h +--- xorg-server-1.20.1/include/site.h 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/include/site.h 2018-09-11 23:52:17.478159278 +0300 @@ -72,7 +72,7 @@ * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE! */ diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_access.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_access.c.patch similarity index 60% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_os_access.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_os_access.c.patch index 8a03bba64..04ff273cd 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_access.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_access.c.patch @@ -1,6 +1,6 @@ -diff -uNr xorg-server-1.19.1/os/access.c xorg-server-1.19.1.mod/os/access.c ---- xorg-server-1.19.1/os/access.c 2017-01-04 23:32:10.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/access.c 2017-11-24 18:44:44.672683897 +0200 +diff -uNr xorg-server-1.20.1/os/access.c xorg-server-1.20.1.mod/os/access.c +--- xorg-server-1.20.1/os/access.c 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/os/access.c 2018-09-11 23:52:17.484825997 +0300 @@ -961,7 +961,7 @@ #if defined WIN32 && defined __MINGW32__ #define ETC_HOST_PREFIX "X" diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_backtrace.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_backtrace.c.patch similarity index 55% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_os_backtrace.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_os_backtrace.c.patch index 33ad7fc25..2b9431d61 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_backtrace.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_backtrace.c.patch @@ -1,7 +1,7 @@ -diff -uNr xorg-server-1.19.1/os/backtrace.c xorg-server-1.19.1.mod/os/backtrace.c ---- xorg-server-1.19.1/os/backtrace.c 2017-01-04 23:32:10.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/backtrace.c 2017-11-24 18:44:44.672683897 +0200 -@@ -250,7 +250,7 @@ +diff -uNr xorg-server-1.20.1/os/backtrace.c xorg-server-1.20.1.mod/os/backtrace.c +--- xorg-server-1.20.1/os/backtrace.c 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/os/backtrace.c 2018-09-11 23:52:17.491492715 +0300 +@@ -251,7 +251,7 @@ closefrom(STDERR_FILENO); snprintf(parent, sizeof(parent), "%d", getppid()); diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_connection.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_connection.c.patch similarity index 62% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_os_connection.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_os_connection.c.patch index 9ad37ad14..04dd7fb9b 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_connection.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_connection.c.patch @@ -1,7 +1,7 @@ -diff -uNr xorg-server-1.19.1/os/connection.c xorg-server-1.19.1.mod/os/connection.c ---- xorg-server-1.19.1/os/connection.c 2017-01-11 22:04:12.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/connection.c 2017-11-24 18:44:44.672683897 +0200 -@@ -1120,7 +1120,7 @@ +diff -uNr xorg-server-1.20.1/os/connection.c xorg-server-1.20.1.mod/os/connection.c +--- xorg-server-1.20.1/os/connection.c 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/os/connection.c 2018-09-11 23:52:17.494826075 +0300 +@@ -996,7 +996,7 @@ XtransConnInfo ciptr; const char *display_env = getenv("DISPLAY"); diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch new file mode 100644 index 000000000..5844c7640 --- /dev/null +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch @@ -0,0 +1,12 @@ +diff -uNr xorg-server-1.20.1/os/osinit.c xorg-server-1.20.1.mod/os/osinit.c +--- xorg-server-1.20.1/os/osinit.c 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/os/osinit.c 2018-09-11 23:52:17.498159434 +0300 +@@ -72,7 +72,7 @@ + #endif + + #ifndef ADMPATH +-#define ADMPATH "/usr/adm/X%smsgs" ++#define ADMPATH "/data/data/com.termux/files/usr/adm/X%smsgs" + #endif + + #ifdef RLIMIT_DATA diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_utils.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_utils.c.patch similarity index 70% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_os_utils.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_os_utils.c.patch index 05d76548b..c2b54b4fb 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_os_utils.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_utils.c.patch @@ -1,19 +1,7 @@ -diff -uNr xorg-server-1.19.1/os/utils.c xorg-server-1.19.1.mod/os/utils.c ---- xorg-server-1.19.1/os/utils.c 2017-01-06 17:03:50.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/utils.c 2017-11-25 12:55:23.884458119 +0200 -@@ -331,7 +331,7 @@ - i = 0; - haslock = 0; - while ((!haslock) && (i++ < 3)) { -- haslock = (link(tmp, LockFile) == 0); -+ haslock = (symlink(tmp, LockFile) == 0); - if (haslock) { - /* - * We're done. -diff -uNr xorg-server-1.19.1/os/utils.c xorg-server-1.19.1.mod/os/utils.c ---- xorg-server-1.19.1/os/utils.c 2017-01-06 17:03:50.000000000 +0200 -+++ xorg-server-1.19.1.mod/os/utils.c 2017-11-24 18:45:32.573282892 +0200 -@@ -239,7 +239,7 @@ +diff -uNr xorg-server-1.20.1/os/utils.c xorg-server-1.20.1.mod/os/utils.c +--- xorg-server-1.20.1/os/utils.c 2018-08-07 19:31:05.000000000 +0300 ++++ xorg-server-1.20.1.mod/os/utils.c 2018-09-11 23:52:17.498159434 +0300 +@@ -228,7 +228,7 @@ * server at a time. This keeps the servers from stomping on each other * if the user forgets to give them different display numbers. */ @@ -22,7 +10,16 @@ diff -uNr xorg-server-1.19.1/os/utils.c xorg-server-1.19.1.mod/os/utils.c #define LOCK_TMP_PREFIX "/.tX" #define LOCK_PREFIX "/.X" #define LOCK_SUFFIX "-lock" -@@ -1392,7 +1392,7 @@ +@@ -320,7 +320,7 @@ + i = 0; + haslock = 0; + while ((!haslock) && (i++ < 3)) { +- haslock = (link(tmp, LockFile) == 0); ++ haslock = (symlink(tmp, LockFile) == 0); + if (haslock) { + /* + * We're done. +@@ -1387,7 +1387,7 @@ _exit(127); if (setuid(getuid()) == -1) _exit(127); @@ -31,7 +28,7 @@ diff -uNr xorg-server-1.19.1/os/utils.c xorg-server-1.19.1.mod/os/utils.c _exit(127); default: /* parent */ do { -@@ -1478,7 +1478,7 @@ +@@ -1473,7 +1473,7 @@ } close(pdes[1]); } @@ -40,7 +37,7 @@ diff -uNr xorg-server-1.19.1/os/utils.c xorg-server-1.19.1.mod/os/utils.c _exit(127); } -@@ -1675,7 +1675,7 @@ +@@ -1670,7 +1670,7 @@ else if (getenv("TMP") != NULL) return getenv("TMP"); else diff --git a/x11-packages/xorg-xvfb/xorg-server-1.19.1_xkb_ddxLoad.c.patch b/x11-packages/xorg-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch similarity index 53% rename from x11-packages/xorg-xvfb/xorg-server-1.19.1_xkb_ddxLoad.c.patch rename to x11-packages/xorg-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch index 7d9a60113..c65ea37d6 100644 --- a/x11-packages/xorg-xvfb/xorg-server-1.19.1_xkb_ddxLoad.c.patch +++ b/x11-packages/xorg-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch @@ -1,7 +1,7 @@ -diff -uNr xorg-server-1.19.1/xkb/ddxLoad.c xorg-server-1.19.1.mod/xkb/ddxLoad.c ---- xorg-server-1.19.1/xkb/ddxLoad.c 2017-01-05 23:19:31.000000000 +0200 -+++ xorg-server-1.19.1.mod/xkb/ddxLoad.c 2017-11-24 18:44:44.682684022 +0200 -@@ -88,8 +88,8 @@ +diff -uNr xorg-server-1.20.1/xkb/ddxLoad.c xorg-server-1.20.1.mod/xkb/ddxLoad.c +--- xorg-server-1.20.1/xkb/ddxLoad.c 2018-08-07 19:31:06.000000000 +0300 ++++ xorg-server-1.20.1.mod/xkb/ddxLoad.c 2018-09-11 23:52:17.501492794 +0300 +@@ -76,8 +76,8 @@ } else #endif