Merge pull request #1767 from bphinz/ubuntu-noble

Updates for package builds
TigerVNC · Jun 19, 2024 · 4812f13 · 4812f13
2 parents 07823c3 + 792c4a0
commit 4812f13
Show file tree

Hide file tree

Showing 22 changed files with 865 additions and 73 deletions.
diff --git a/.github/containers/centos7/Dockerfile b/.github/containers/centos7/Dockerfile
diff --git a/.github/containers/centos7/build.sh b/.github/containers/centos7/build.sh
diff --git a/.github/containers/noble/Dockerfile b/.github/containers/noble/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:noble
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+RUN apt-get -y install packaging-dev equivs
+
+RUN useradd -s /bin/bash -m deb
+RUN echo >> /etc/sudoers
+RUN echo "deb ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+USER deb
+WORKDIR /home/deb
diff --git a/.github/containers/noble/build.sh b/.github/containers/noble/build.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+set -x
+
+## Basic variables
+
+CURDIR=$(dirname $(readlink -f $0))
+TOPDIR=$(git rev-parse --show-toplevel 2>/dev/null)
+
+DEBDIR=${TOPDIR}/contrib/packages/deb/ubuntu-noble
+
+VERSION=$(grep '^set(VERSION ' ${TOPDIR}/CMakeLists.txt | sed 's@^set(VERSION \(.*\))@\1@')
+
+## Prepare the build directory
+
+rm -rf ${CURDIR}/build
+mkdir -p ${CURDIR}/build
+chmod a+w ${CURDIR}/build
+[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && chcon -Rt container_file_t ${CURDIR}/build
+
+## Copy over the source code
+
+(cd ${TOPDIR} && git archive --prefix tigervnc-${VERSION}/ HEAD) | xz > ${CURDIR}/build/tigervnc_${VERSION}.orig.tar.xz
+
+## Copy over the packaging files
+
+cp -r ${DEBDIR}/debian ${CURDIR}/build/debian
+
+chmod a+x ${CURDIR}/build/debian/rules
+
+# Assemble a fake changelog entry to get the correct version
+
+cat - > ${CURDIR}/build/debian/changelog << EOT
+tigervnc (${VERSION}-1ubuntu1) UNRELEASED; urgency=low
+
+  * Automated build for TigerVNC
+
+ -- Build bot <[email protected]>  $(date -R)
+
+EOT
+cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog
+
+## Start the build
+
+docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \
+	bash -e -x -c "
+	tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz
+	cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian
+	sudo apt-get update
+	mk-build-deps ~/build/tigervnc-${VERSION}/debian/control
+	sudo DEBIAN_FRONTEND=noninteractive \
+	    apt-get install -y ~/tigervnc-build-deps_*.deb
+	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage
+	"
+
+mkdir -p ${CURDIR}/result
+cp -av ${CURDIR}/build/*.deb ${CURDIR}/result
+cp -av ${CURDIR}/build/*.ddeb ${CURDIR}/result
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,11 +111,11 @@ jobs:
     strategy:
       matrix:
         target:
-          - centos7
           - rocky8
           - rocky9
           - focal
           - jammy
+          - noble
       fail-fast: false
     runs-on: ubuntu-latest
     env:

diff --git a/contrib/packages/deb/ubuntu-focal/debian/control b/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,

diff --git a/contrib/packages/deb/ubuntu-focal/debian/copyright b/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

diff --git a/contrib/packages/deb/ubuntu-jammy/debian/control b/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,

diff --git a/contrib/packages/deb/ubuntu-jammy/debian/copyright b/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

diff --git a/contrib/packages/deb/ubuntu-noble/debian/changelog b/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
diff --git a/contrib/packages/deb/ubuntu-noble/debian/compat b/contrib/packages/deb/ubuntu-noble/debian/compat
@@ -0,0 +1 @@
+10
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,11 +111,11 @@ jobs: @@
         strategy:
           matrix:
             target:
-              - centos7
               - rocky8
               - rocky9
               - focal
               - jammy
+              - noble
           fail-fast: false
         runs-on: ubuntu-latest
         env:
@@ Expand Down @@