Remove the last vestiges of support for dbus 1.6 and Ubuntu 14.04

Signed-off-by: Simon McVittie <smcv@collabora.com>

4 files changed, 10 insertions, 51 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b271e7c..6bf4e80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,14 +66,4 @@ build:xenial:
     ci_suite: "xenial"
   script: *script
 
-build:trusty:
-  stage: build
-  image: "ubuntu:trusty"
-  variables:
-    ci_distro: "ubuntu"
-    ci_suite: "trusty"
-  script:
-    - chown -R user .
-    - sudo -u user -H ./tools/ci-build.sh
-
 # vim:set sw=2 sts=2 et:
diff --git a/NEWS b/NEWS
index 4ba1408..4d249e6 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,12 @@ CONTRIBUTING.md for more details.
 
 Dependencies:
 
+• dbus 1.8 was already required, but is more strongly required now:
+  the workarounds that were used to run continuous integration with dbus
+  1.6 on Ubuntu 14.04 'trusty' have been removed. (Note that dbus 1.8
+  has already reached end-of-life for security support, and newer dbus
+  stable branches are strongly recommended.)
+
 • pkg-config 0.28 is required when building from git
 
 Enhancements:
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 8357db7..82bb90a 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -85,39 +85,6 @@ maybe_fail_tests () {
     fi
 }
 
-# We require dbus-run-session, but it isn't in the version of dbus in
-# Ubuntu 14.04. Take the version from dbus-1.10.0 and alter it to be
-# standalone.
-if ! command -v dbus-run-session >/dev/null; then
-	drsdir="$(mktemp -d -t "d-r-s.XXXXXX")"
-	wget -O "$drsdir/dbus-run-session.c" \
-		"https://cgit.freedesktop.org/dbus/dbus/plain/tools/dbus-run-session.c?h=dbus-1.10.0"
-	sed -e 's/^	//' > "$drsdir/config.h" <<EOF
-	#include <stdlib.h>
-
-	#define VERSION "1.10.0~local"
-	#define dbus_setenv my_dbus_setenv
-
-	static inline int
-	my_dbus_setenv (const char *name, const char *value)
-	{
-		if (value)
-			return !setenv (name, value, 1);
-		else
-			return !unsetenv (name);
-	}
-EOF
-	cc -I"${drsdir}" -o"${drsdir}/dbus-run-session" \
-		"${drsdir}/dbus-run-session.c" \
-		$(pkg-config --cflags --libs dbus-1) \
-		${NULL}
-	export PATH="${drsdir}:$PATH"
-
-	# Force the build to be run even though dbus is less than version 1.8.
-	export DBUS_CFLAGS="$(pkg-config --cflags dbus-1)"
-	export DBUS_LIBS="$(pkg-config --libs dbus-1)"
-fi
-
 NOCONFIGURE=1 ./autogen.sh
 
 srcdir="$(pwd)"
diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 453488d..57bb307 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -52,7 +52,7 @@ NULL=
 # OS suite (release, branch) in which we are testing.
 # Typical values for ci_distro=debian: sid, jessie
 # Typical values for ci_distro=fedora might be 25, rawhide
-: "${ci_suite:=trusty}"
+: "${ci_suite:=xenial}"
 
 if [ $(id -u) = 0 ]; then
     sudo=
@@ -79,9 +79,6 @@ case "$ci_distro" in
         $sudo sed -i -e 's/httpredir\.debian\.org/deb.debian.org/g' \
             /etc/apt/sources.list
 
-        # travis-ci has a sources list for Chrome which doesn't support i386
-        : | $sudo tee /etc/apt/sources.list.d/google-chrome.list
-
         $sudo apt-get -qq -y update
 
         $sudo apt-get -qq -y install \
@@ -110,10 +107,9 @@ case "$ci_distro" in
         fi
 
         case "$ci_suite" in
-            (trusty|jessie)
-                # Ubuntu 14.04's autoconf-archive is too old, and older
-                # gnome-common has files in common with it. These are
-                # from Debian 9 'stretch'.
+            (jessie)
+                # Debian 9's autoconf-archive is too old, and older
+                # gnome-common has files in common with it.
                 wget http://deb.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20160916-1_all.deb
                 wget http://deb.debian.org/debian/pool/main/g/gnome-common/gnome-common_3.18.0-3_all.deb
                 $sudo dpkg -i --auto-deconfigure gnome-common_*_all.deb autoconf-archive_*_all.deb