Updates for package builds

.github/containers/bionic/Dockerfile → .github/containers/noble/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 

.github/containers/bionic/build.sh → .github/containers/noble/build.sh

@@ -8,7 +8,7 @@ set -x
 CURDIR=$(dirname $(readlink -f $0))
 TOPDIR=$(git rev-parse --show-toplevel 2>/dev/null)
 
-DEBDIR=${TOPDIR}/contrib/packages/deb/ubuntu-bionic
+DEBDIR=${TOPDIR}/contrib/packages/deb/ubuntu-noble
 
 VERSION=$(grep '^set(VERSION ' ${TOPDIR}/CMakeLists.txt | sed 's@^set(VERSION \(.*\))@\1@')
 

.github/workflows/build.yml

@@ -111,12 +111,11 @@ jobs:
     strategy:
       matrix:
         target:
-          - centos7
           - rocky8
           - rocky9
-          - bionic
           - focal
           - jammy
+          - noble
       fail-fast: false
     runs-on: ubuntu-latest
     env:

contrib/packages/deb/ubuntu-focal/debian/control

@@ -13,7 +13,6 @@ Build-Depends:
  cmake,
  pkg-config,
  gettext,
- libpixman-1-dev,
  zlib1g-dev,
  libjpeg-turbo8-dev,
  libavcodec-dev,
@@ -24,9 +23,6 @@ Build-Depends:
  libgmp-dev,
  libpam0g-dev,
  libpng-dev,
- libxext-dev,
- libxi-dev,
- libxtst-dev,
  libxrandr-dev,
  libxdamage-dev,
  libxfixes-dev,
@@ -37,7 +33,6 @@ Build-Depends:
 # Xorg dependencies
  debhelper (>= 10),
  po-debconf,
- dpkg-dev (>= 1.16.1),
  quilt,
  lsb-release,
  pkg-config,

contrib/packages/deb/ubuntu-focal/debian/copyright

@@ -22,7 +22,7 @@ TigerVNC is
         Copyright (C) 2009-2011 D. R. Commander
         Copyright (C) 2009-2011 Pierre Ossman for Cendio AB
         Copyright (C) 2004, 2009-2011 Red Hat, Inc.
-        Copyright (C) 2009-2019 TigerVNC Team
+        Copyright (C) 2009-2024 TigerVNC Team
         All Rights Reserved.
 
 This software is distributed under the GNU General Public Licence as published

contrib/packages/deb/ubuntu-jammy/debian/control

@@ -11,25 +11,18 @@ Build-Depends:
  dpkg-dev (>= 1.16.1),
  appstream,
  cmake,
- pkg-config,
  gettext,
- libpixman-1-dev,
  zlib1g-dev,
  libjpeg-turbo8-dev,
  libavcodec-dev,
  libavutil-dev,
  libswscale-dev,
  libgnutls28-dev,
- nettle-dev,
  libgmp-dev,
  libpam0g-dev,
  libpng-dev,
- libxext-dev,
- libxi-dev,
- libxtst-dev,
  libxrandr-dev,
  libxdamage-dev,
- libxfixes-dev,
  libfltk1.3-dev,
  xorg-server-source,
  xserver-xorg-dev,

contrib/packages/deb/ubuntu-jammy/debian/copyright

@@ -22,7 +22,7 @@ TigerVNC is
         Copyright (C) 2009-2011 D. R. Commander
         Copyright (C) 2009-2011 Pierre Ossman for Cendio AB
         Copyright (C) 2004, 2009-2011 Red Hat, Inc.
-        Copyright (C) 2009-2019 TigerVNC Team
+        Copyright (C) 2009-2024 TigerVNC Team
         All Rights Reserved.
 
 This software is distributed under the GNU General Public Licence as published

contrib/packages/deb/ubuntu-noble/debian/changelog

@@ -0,0 +1,5 @@
+tigervnc (1.13.80) noble; urgency=low
+
+  * Initial release.
+
+ -- Brian P. Hinz <[email protected]>  Tue, 18 Jun 2024 18:50:23 -0400

contrib/packages/deb/ubuntu-bionic/debian/control → contrib/packages/deb/ubuntu-noble/debian/control

@@ -13,7 +13,6 @@ Build-Depends:
  cmake,
  pkg-config,
  gettext,
- libpixman-1-dev,
  zlib1g-dev,
  libjpeg-turbo8-dev,
  libavcodec-dev,
@@ -24,74 +23,42 @@ Build-Depends:
  libgmp-dev,
  libpam0g-dev,
  libpng-dev,
- libxext-dev,
- libxi-dev,
- libxtst-dev,
  libxrandr-dev,
  libxdamage-dev,
- libxfixes-dev,
  libfltk1.3-dev,
  xorg-server-source,
  xserver-xorg-dev,
  openjdk-8-jdk,
 # Xorg dependencies
- debhelper (>= 9),
- dh-autoreconf,
- po-debconf,
- dpkg-dev (>= 1.16.1),
+# debhelper-compat (= 12),
  quilt,
- lsb-release,
- pkg-config,
  bison,
  flex,
  xutils-dev (>= 1:7.6+4),
  xfonts-utils (>= 1:7.5+1),
- x11proto-bigreqs-dev (>= 1:1.1.0),
- x11proto-composite-dev (>= 1:0.4),
- x11proto-core-dev (>= 7.0.31),
- x11proto-damage-dev (>= 1.1),
- x11proto-fixes-dev (>= 1:5.0),
- x11proto-fonts-dev (>= 2.1.3),
- x11proto-kb-dev (>= 1.0.3),
- x11proto-xinerama-dev,
- x11proto-randr-dev (>= 1.5.0),
- x11proto-record-dev (>= 1.13.99.1),
- x11proto-render-dev (>= 2:0.11),
- x11proto-resource-dev (>= 1.2.0),
- x11proto-scrnsaver-dev,
- x11proto-video-dev,
- x11proto-xcmisc-dev (>= 1.2.0),
- x11proto-xext-dev (>= 7.2.99.901),
- x11proto-xf86bigfont-dev (>= 1.2.0),
- x11proto-xf86dga-dev (>= 2.0.99.1),
- x11proto-xf86vidmode-dev (>= 2.2.99.1),
- x11proto-present-dev,
- x11proto-dri3-dev,
+ x11proto-dev (>= 2021.5),
  xtrans-dev (>= 1.3.5),
  libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.3),
- x11proto-dri2-dev (>= 2.8),
+ libxcvt-dev,
  libxdmcp-dev (>= 1:0.99.1),
  libxfont-dev (>= 1:2.0.1),
  libxkbfile-dev (>= 1:0.99.1),
  libpixman-1-dev (>= 0.27.2),
  libpciaccess-dev (>= 0.12.901),
- libgcrypt-dev,
- nettle-dev,
+ libgcrypt20-dev,
  libudev-dev (>= 151-3) [linux-any],
  libselinux1-dev (>= 2.0.80) [linux-any],
  libaudit-dev [linux-any],
- x11proto-xf86dri-dev (>= 2.1.0),
- libdrm-dev (>= 2.4.46) [!hurd-i386],
- x11proto-gl-dev (>= 1.4.17),
+ libdrm-dev (>= 2.4.107-5~) [!hurd-i386],
  libgl1-mesa-dev (>= 9.2),
+ mesa-common-dev,
+# Don't use libunwind for armel, armhf, and arm64 as this library is buggy (bug #923962) on those architectures.
+ libunwind-dev [amd64 hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
  libxmuu-dev (>= 1:0.99.1),
  libxext-dev (>= 1:0.99.1),
  libx11-dev (>= 2:1.6),
  libxrender-dev (>= 1:0.9.0),
- libxi-dev (>= 2:1.6.99.1),
- x11proto-dmx-dev (>= 1:2.2.99.1),
- libdmx-dev (>= 1:1.0.1),
+ libxi-dev (>= 2:1.8),
  libxpm-dev (>= 1:3.5.3),
  libxaw7-dev (>= 1:0.99.1),
  libxt-dev (>= 1:0.99.1),
@@ -106,15 +73,31 @@ Build-Depends:
  libepoxy-dev [linux-any kfreebsd-any],
  libegl1-mesa-dev [linux-any kfreebsd-any],
  libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
+## XCB bits for Xephyr
+# libx11-xcb-dev,
+# libxcb1-dev,
+# libxcb-xkb-dev,
+# libxcb-shape0-dev,
+# libxcb-render0-dev,
+# libxcb-render-util0-dev,
+# libxcb-util0-dev,
+# libxcb-image0-dev,
+# libxcb-icccm4-dev,
+# libxcb-shm0-dev,
+# libxcb-keysyms1-dev,
+# libxcb-randr0-dev,
+# libxcb-xv0-dev,
+# libxcb-glx0-dev,
+# libxcb-xf86dri0-dev (>= 1.6),
 # unit tests
  xkb-data,
  x11-xkb-utils,
 # arc4random_buf(), getpeereid()
  libbsd-dev,
 #logind
- libdbus-1-dev (>= 1.0) [linux-any],
+  libdbus-1-dev (>= 1.0) [linux-any],
 # systemd-daemon
- libsystemd-dev [linux-any],
+  libsystemd-dev [linux-any],
 Homepage: http://www.tigervnc.com
 
 Package: tigervncserver

contrib/packages/deb/ubuntu-bionic/debian/copyright → contrib/packages/deb/ubuntu-noble/debian/copyright

@@ -1,5 +1,5 @@
 This package was packaged for Debian by Brian P. Hinz <[email protected]>
-on Mon, 28 Oct 2019 21:29:33 +0500 using the tightvnc package as a base.
+on Tue, 18 Jun 2024 18:54:03 -0400 using the tightvnc package as a base.
 
 It was downloaded from:
 	https://www.tigervnc.org/
@@ -22,7 +22,7 @@ TigerVNC is
         Copyright (C) 2009-2011 D. R. Commander
         Copyright (C) 2009-2011 Pierre Ossman for Cendio AB
         Copyright (C) 2004, 2009-2011 Red Hat, Inc.
-        Copyright (C) 2009-2019 TigerVNC Team
+        Copyright (C) 2009-2024 TigerVNC Team
         All Rights Reserved.
 
 This software is distributed under the GNU General Public Licence as published

contrib/packages/deb/ubuntu-bionic/debian/rules → contrib/packages/deb/ubuntu-noble/debian/rules

@@ -45,7 +45,7 @@ XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz
 
 xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
 	tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
-	cd unix/xserver && patch -p1 < ../xserver119.patch
+	cd unix/xserver && patch -p1 < ../xserver21.1.1.patch
 	patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
 	touch xorg-source-stamp
 
@@ -102,7 +102,7 @@ config-stamp: xorg-source-stamp
 		--enable-xdmcp \
 		--enable-xdm-auth-1 \
 		--enable-glx \
-		--disable-dri --enable-dri2 --enable-dri3 \
+		--disable-dri --enable-dri2 --disable-dri3 \
 		--enable-xinerama \
 		--enable-xf86vidmode \
 		--enable-xace \