Resolve KASM-4032 "Feature/ build fedora 37"

builder/build.sh

@@ -40,7 +40,7 @@ EOF
 #sudo apt-get install cmake git libjpeg-dev libgnutls-dev
 
 # Gcc12 builds fail due to bug
-fail_on_gcc_12
+#fail_on_gcc_12
 
 # Ubuntu applies a million patches, but here we use upstream to simplify matters
 cd /tmp
@@ -89,6 +89,7 @@ ensure_crashpad_can_fetch_line_number_by_address
 if [ "${KASMVNC_BUILD_OS}" == "opensuse" ]; then
   sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
 fi
+# build X11
 ./configure --prefix=/opt/kasmweb \
 	--with-xkb-path=/usr/share/X11/xkb \
 	--with-xkb-output=/var/lib/xkb \
@@ -101,6 +102,8 @@ fi
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--disable-config-hal --disable-config-udev \
 	--disable-dri2 --enable-glx --disable-xwayland --disable-dri3
+# remove array bounds errors for new versions of GCC
+find . -name "Makefile" -exec sed -i 's/-Werror=array-bounds//g' {} \;
 make -j5
 
 # modifications for the servertarball

builder/dockerfile.fedora_thirtyseven.barebones.rpm.test

@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:37
 
 ENV STARTUPDIR=/dockerstartup
 

builder/dockerfile.fedora_thirtyseven.build

@@ -0,0 +1,65 @@
+FROM fedora:37
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME thirtyseven
+ENV XORG_VER 1.20.7
+
+RUN \
+  echo "**** install build deps ****" && \
+  dnf install -y \
+    autoconf \
+    automake \
+    bzip2 \
+    cmake \
+    gcc \
+    gcc-c++ \
+    git \
+    libdrm-devel \
+    libepoxy-devel \
+    libjpeg-turbo-devel \
+    libjpeg-turbo-static \
+    libpciaccess-devel \
+    libtool \
+    libwebp-devel \
+    libX11-devel \
+    libXau-devel \
+    libxcb-devel \
+    libXcursor-devel \
+    libxcvt-devel \
+    libXdmcp-devel \
+    libXext-devel \
+    libXfont2-devel \
+    libxkbfile-devel \
+    libXrandr-devel \
+    libxshmfence-devel \
+    libXtst-devel \
+    mesa-libEGL-devel \
+    mesa-libGL-devel \
+    meson \
+    nettle-devel \
+    openssl-devel \
+    patch \
+    pixman-devel \
+    wayland-devel \
+    wget \
+    xcb-util-devel \
+    xcb-util-image-devel \
+    xcb-util-keysyms-devel \
+    xcb-util-renderutil-devel \
+    xcb-util-wm-devel \
+    xinit \
+    xkbcomp \
+    xkbcomp-devel \
+    xkeyboard-config \
+    xorg-x11-font-utils \
+    xorg-x11-proto-devel \
+    xorg-x11-server-common \
+    xorg-x11-server-devel \
+    xorg-x11-xtrans-devel
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+COPY --chown=docker:docker . /src/
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.fedora_thirtyseven.rpm.build

@@ -1,11 +1,11 @@
-FROM fedora:33
+FROM fedora:37
 
 RUN dnf install -y fedora-packager fedora-review
 RUN dnf install -y tree vim less
 RUN dnf install -y redhat-lsb-core
 RUN dnf install -y dnf-plugins-core
 
-COPY centos/*.spec /tmp
+COPY fedora/*.spec /tmp
 RUN dnf builddep -y /tmp/*.spec
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd

builder/dockerfile.fedora_thirtyseven.rpm.test

@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:37
 
 ENV DISPLAY=:1 \
     VNC_PORT=8443 \
@@ -47,7 +47,7 @@ COPY builder/startup/ $STARTUPDIR
 
 ### START CUSTOM STUFF ####
 COPY ./builder/scripts/ /tmp/scripts/
-COPY ./centos/kasmvncserver.spec /tmp
+COPY ./fedora/kasmvncserver.spec /tmp
 
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/

builder/dockerfile.fedora_thirtythree.build

@@ -1,38 +0,0 @@
-FROM fedora:33
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtythree
-ENV XORG_VER 1.20.10
-
-# RUN dnf install -y build-dep xorg-server libxfont-dev sudo
-RUN dnf install -y gcc cmake git gnutls-devel vim wget
-#tightvncserver
-RUN dnf install -y libjpeg-turbo-devel libpng-devel libtiff-devel giflib-devel openssl-devel
-
-#libavcodec-dev
-RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-RUN dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-RUN dnf -y install ffmpeg-devel
-
-RUN dnf install -y make
-RUN dnf group install -y "Development Tools"
-RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
-RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
-  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel libXtst-devel \
-  libXcursor-devel
-RUN dnf install -y mesa-dri-drivers
-RUN dnf install -y bzip2 redhat-lsb-core
-
-# Additions for webp
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
-RUN cd /tmp/libwebp-1.0.2 && \
-    ./configure --enable-static --disable-shared && \
-    make && make install
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]