From 8e769d2cabcc9947c39492cc994d5eea1b1f52a9 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Thu, 9 Apr 2020 18:39:57 -0700
Subject: [PATCH] More build fixes.

---
 .circleci/config.yml | 14 ++++++++++++++
 CMakeLists.txt       |  3 +++
 snap/snapcraft.yaml  |  3 ---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f81bae91..67e342e2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,19 @@ jobs:
       - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
       - store_artifacts:
           path: /root/debs/
+  build_ubuntu_focal:
+    docker:
+      - image: ubuntu:focal
+    steps:
+      - checkout
+      - run: apt-get update
+      - run: apt-get install -y build-essential clang cmake libboost-thread1.71-dev libboost-system1.71-dev libboost-filesystem1.71-dev libboost-date-time1.71-dev libboost-atomic1.71-dev libboost-chrono1.71-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev libsystemd-dev
+      - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=eoan -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
+      - run: make -j2
+      - run: make package
+      - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
+      - store_artifacts:
+          path: /root/debs/
   build_fedora_26:
     docker:
       - image: fedora:26
@@ -126,6 +139,7 @@ workflows:
       - build_ubuntu_cosmic: *workflow_filters
       - build_ubuntu_disco: *workflow_filters
       - build_ubuntu_eoan: *workflow_filters
+      - build_ubuntu_focal: *workflow_filters
       - build_fedora_26: *workflow_filters
       - build_fedora_27: *workflow_filters
       - build_fedora_28: *workflow_filters
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84bfa7850..31a7bcfd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,6 +314,9 @@ if (GENERATE_DEB MATCHES "1")
       set(DEB_AVUTIL_VERSION "56")
       set(DEB_AVFORMAT_VERSION "58")
       set(DEB_SWRESAMPLE_VERSION "3")
+    elseif (DEB_DISTRO MATCHES "focal")
+      set(DEB_BOOST_VERSION "1.71.0")
+      set(DEB_MICROHTTPD_VERSION "12")
     elseif (DEB_DISTRO MATCHES "xenial")
       set(DEB_BOOST_VERSION "1.58.0")
       set(DEB_MICROHTTPD_VERSION "10")
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f3be549e9..0b146129e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -91,10 +91,7 @@ apps:
       - network-bind
       - audio-playback
       - alsa
-      - unity7
-      - x11
       - desktop
-      - desktop-legacy
     slots:
       - mpris