From 500a760a43409ed75c053c3c6c4186325901252c Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 24 Feb 2020 20:43:10 +0200 Subject: [PATCH] libxcb: fix build failure --- packages/libcairo/build.sh | 2 +- packages/libx11/build.sh | 2 +- packages/libxcb/libxcb-1.12_configure.patch | 11 ----------- packages/libxcb/libxcb-1.12_src_xcb_util.c.patch | 2 +- packages/libxext/build.sh | 2 +- packages/libxft/build.sh | 2 +- packages/libxss/build.sh | 2 +- 7 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 packages/libxcb/libxcb-1.12_configure.patch diff --git a/packages/libcairo/build.sh b/packages/libcairo/build.sh index c8ad4b3f2..169fc18d6 100644 --- a/packages/libcairo/build.sh +++ b/packages/libcairo/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16.0 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/cairo-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, liblzo, libpixman, libpng, libx11, libxcb, libxext, libxrender, zlib" diff --git a/packages/libx11/build.sh b/packages/libx11/build.sh index 83e6868a5..a3a41183c 100644 --- a/packages/libx11/build.sh +++ b/packages/libx11/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="X11 client-side library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.6.9 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libX11-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1 TERMUX_PKG_DEPENDS="libandroid-support, libxcb" diff --git a/packages/libxcb/libxcb-1.12_configure.patch b/packages/libxcb/libxcb-1.12_configure.patch deleted file mode 100644 index 7cbb933af..000000000 --- a/packages/libxcb/libxcb-1.12_configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure 2016-05-18 22:14:50.000000000 +0530 -+++ ../configure 2017-02-08 22:48:44.459892477 +0530 -@@ -19666,7 +19666,7 @@ - $as_echo "yes" >&6; } - - fi --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEEDED" >&5 diff --git a/packages/libxcb/libxcb-1.12_src_xcb_util.c.patch b/packages/libxcb/libxcb-1.12_src_xcb_util.c.patch index 78c01661b..f2db1953d 100644 --- a/packages/libxcb/libxcb-1.12_src_xcb_util.c.patch +++ b/packages/libxcb/libxcb-1.12_src_xcb_util.c.patch @@ -6,7 +6,7 @@ diff -uNr libxcb-1.12/src/xcb_util.c libxcb-1.12.mod/src/xcb_util.c static const char unix_base[] = "/usr/spool/sockets/X11/"; #else - static const char unix_base[] = "/tmp/.X11-unix/X"; -+ static const char unix_base[] = "/data/data/com.termux/files/usr/tmp/.X11-unix/X"; ++ static const char unix_base[] = "@TERMUX_PREFIX@/tmp/.X11-unix/X"; #endif const char *base = unix_base; size_t filelen; diff --git a/packages/libxext/build.sh b/packages/libxext/build.sh index e0af9ae5e..9ecf09626 100644 --- a/packages/libxext/build.sh +++ b/packages/libxext/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="X11 miscellaneous extensions library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.3.4 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXext-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull" diff --git a/packages/libxft/build.sh b/packages/libxft/build.sh index e6ca7bff0..397587ae1 100644 --- a/packages/libxft/build.sh +++ b/packages/libxft/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="FreeType-based font drawing library for X" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.3.3 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXft-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216 TERMUX_PKG_DEPENDS="fontconfig, freetype, libbz2, liblzma, libpng, libuuid, libx11, libxau, libxcb, libxdmcp, libxml2, libxrender" diff --git a/packages/libxss/build.sh b/packages/libxss/build.sh index 8e77d992f..55017f850 100644 --- a/packages/libxss/build.sh +++ b/packages/libxss/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="X11 Screen Saver extension library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.2.3 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8 TERMUX_PKG_DEPENDS="libx11, libxau, libxcb, libxdmcp, libxext"