-DENABLE_GNUTLS=OFF \

src/tigervnc/build.sh

@@ -286,16 +286,18 @@ log "Patching TigerVNC..."
 # Apply the TigerVNC patch against the X server.
 patch -p1 -d /tmp/tigervnc/unix/xserver < /tmp/tigervnc/unix/xserver120.patch
 
-# # Build a static binary of vncpasswd.
-# patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/vncpasswd-static.patch
-# # Disable PAM support.
-# patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/disable-pam.patch
-# # Fix static build.
-# patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/static-build.patch
-patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/tigervnc-1.12.0-configuration_fixes-1.patch
+# Build a static binary of vncpasswd.
+patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/vncpasswd-static.patch
+# Disable PAM support.
+patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/disable-pam.patch
+# Fix static build.
+patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/static-build.patch
+# patch -p1 -d /tmp/tigervnc < "$SCRIPT_DIR"/tigervnc-1.12.0-configuration_fixes-1.patch
 
 log "Configuring TigerVNC..."
 (
+    # https://github.com/TigerVNC/tigervnc/issues/998
+    # -DENABLE_GNUTLS=ON \
     cd /tmp/tigervnc && cmake -G "Unix Makefiles" \
         $(xx-clang --print-cmake-defines) \
         -DCMAKE_FIND_ROOT_PATH=$(xx-info sysroot) \
@@ -307,7 +309,7 @@ log "Configuring TigerVNC..."
         -DCMAKE_BUILD_TYPE=Release \
         -DINSTALL_SYSTEMD_UNITS=OFF \
         -DENABLE_NLS=OFF \
-        -DENABLE_GNUTLS=ON \
+        -DENABLE_GNUTLS=OFF \
         -DENABLE_NETTLE=ON \
         -DBUILD_VIEWER=OFF \
 )
@@ -373,7 +375,9 @@ autoreconf -fiv /tmp/tigervnc/unix/xserver
 # Remove all automatic dependencies on libraries and manually define them to
 # have the correct order.
 find /tmp/tigervnc -name "*.la" -exec sed 's/^dependency_libs/#dependency_libs/' -i {} ';'
-sed 's/^XSERVER_SYS_LIBS = .*/XSERVER_SYS_LIBS = -lXau -lXdmcp -lpixman-1 -ljpeg -lXfont2 -lfreetype -lfontenc -lpng16 -lbrotlidec -lbrotlicommon -lz -lbz2 -lgnutls -lhogweed -lgmp -lnettle -lunistring -ltasn1 -lbsd -lmd/' -i /tmp/tigervnc/unix/xserver/hw/vnc/Makefile
+# sed 's/^XSERVER_SYS_LIBS = .*/XSERVER_SYS_LIBS = -lXau -lXdmcp -lpixman-1 -ljpeg -lXfont2 -lfreetype -lfontenc -lpng16 -lbrotlidec -lbrotlicommon -lz -lbz2 -lgnutls -lhogweed -lgmp -lnettle -lunistring -ltasn1 -lbsd -lmd/' -i /tmp/tigervnc/unix/xserver/hw/vnc/Makefile
+#  -lbrotlidec -lbrotlicommon
+sed 's/^XSERVER_SYS_LIBS = .*/XSERVER_SYS_LIBS = -lXau -lXdmcp -lpixman-1 -ljpeg -lXfont2 -lfreetype -lfontenc -lpng16 -lz -lbz2 -lgnutls -lhogweed -lgmp -lnettle -lunistring -ltasn1 -lbsd -lmd/' -i /tmp/tigervnc/unix/xserver/hw/vnc/Makefile
 
 log "Compiling TigerVNC server..."
 make -C /tmp/tigervnc/unix/xserver -j$(nproc)