mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2025-06-26 04:31:23 +02:00
KASM-3806 remove panic assert from Fedora and fix Opensuse builds
This commit is contained in:
parent
8b9ef1bc15
commit
3070de6d10
@ -67,6 +67,11 @@ make -j5
|
|||||||
tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
|
tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
|
||||||
|
|
||||||
cd unix/xserver
|
cd unix/xserver
|
||||||
|
# Remove assertion that breaks stock Fedora
|
||||||
|
if [ "${KASMVNC_BUILD_OS}" == "fedora" ]; then
|
||||||
|
sed -i '/assert(key->initialized)/d' include/privates.h
|
||||||
|
fi
|
||||||
|
# Apply patches
|
||||||
patch -Np1 -i ../xserver${XORG_PATCH}.patch
|
patch -Np1 -i ../xserver${XORG_PATCH}.patch
|
||||||
case "$XORG_VER" in
|
case "$XORG_VER" in
|
||||||
1.20.*)
|
1.20.*)
|
||||||
@ -91,7 +96,7 @@ if [ ! "${KASMVNC_BUILD_OS}" == "centos" ]; then
|
|||||||
fi
|
fi
|
||||||
# remove gl check for opensuse
|
# remove gl check for opensuse
|
||||||
if [ "${KASMVNC_BUILD_OS}" == "opensuse" ] || ([ "${KASMVNC_BUILD_OS}" == "oracle" ] && [ "${KASMVNC_BUILD_OS_CODENAME}" == 9 ]); then
|
if [ "${KASMVNC_BUILD_OS}" == "opensuse" ] || ([ "${KASMVNC_BUILD_OS}" == "oracle" ] && [ "${KASMVNC_BUILD_OS_CODENAME}" == 9 ]); then
|
||||||
sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
|
sed -i 's/LIBGL="gl >= 9.2.0"/LIBGL="gl >= 1.1"/g' configure
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build X11
|
# build X11
|
||||||
|
Loading…
x
Reference in New Issue
Block a user