sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xorg-server-xvfb: remove man1/Xserver.1.gz from package

Browse Source 
Otherwise it conflicts with xorg-server.  Also fix double /usr in
removed file $TERMUX_PREFIX/usr/share/X11/xkb/compiled.

Fixes https://github.com/termux/x11-packages/issues/596.
This commit is contained in:
Henrik Grimler 2022-02-03 20:38:01 +01:00 committed by Yaksh Bariya
parent 4e09da7452
commit 25295348a6
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11-packages/xorg-server-xvfb/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="X virtual framebuffer"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.20.11
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
@ -54,7 +54,13 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-sha1=libcrypto
--with-fontrootdir=${TERMUX_PREFIX}/share/fonts
--with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb
LIBS=-landroid-shmem"
LIBS=-landroid-shmem
"
TERMUX_PKG_RM_AFTER_INSTALL="
share/X11/xkb/compiled
share/man/man1/Xserver.1
"
termux_step_pre_configure() {
CFLAGS+=" -DFNDELAY=O_NDELAY"
@ -65,10 +71,6 @@ termux_step_pre_configure() {
fi
}
termux_step_post_make_install() {
rm -f "${TERMUX_PREFIX}/usr/share/X11/xkb/compiled"
}
## The following is required for package 'tigervnc'.
if [ "${#}" -eq 1 ] && [ "${1}" == "xorg_server_flags" ]; then
echo ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}