From 2aaa2e34a9306f5e25d3985ab4601418c07bd539 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 1 Mar 2021 22:10:21 +0200 Subject: [PATCH] tigervnc: fix build issues %ci:no-build --- x11-packages/tigervnc/build.sh | 2 ++ .../tigervnc/fix-xorg-configure.patch.txt | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 x11-packages/tigervnc/fix-xorg-configure.patch.txt diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh index 20f2ba9aa..02b032b58 100644 --- a/x11-packages/tigervnc/build.sh +++ b/x11-packages/tigervnc/build.sh @@ -40,6 +40,8 @@ termux_step_pre_configure() { export ACLOCAL="aclocal -I ${TERMUX_PREFIX}/share/aclocal" autoreconf -fi + patch -p3 -i ${TERMUX_PKG_BUILDER_DIR}/fix-xorg-configure.patch.txt + CFLAGS="${CFLAGS/-Os/-Oz} -DFNDELAY=O_NDELAY -DINITARGS=void" CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm" LDFLAGS="${LDFLAGS} -llog" diff --git a/x11-packages/tigervnc/fix-xorg-configure.patch.txt b/x11-packages/tigervnc/fix-xorg-configure.patch.txt new file mode 100644 index 000000000..a0f6ec716 --- /dev/null +++ b/x11-packages/tigervnc/fix-xorg-configure.patch.txt @@ -0,0 +1,20 @@ +--- ./unix/xserver/configure.bak 2021-03-01 20:05:50.721308293 +0000 ++++ ./unix/xserver/configure 2021-03-01 20:06:31.217671971 +0000 +@@ -25631,7 +25631,7 @@ + RAWCPP="$ac_cv_path_RAWCPP" + fi + +- ++if false; then + # Check for flag to avoid builtin definitions - assumes unix is predefined, + # which is not the best choice for supporting other OS'es, but covers most + # of the ones we need for now. +@@ -25680,7 +25680,7 @@ + fi + fi + rm -f conftest.$ac_ext +- ++fi + + +