From e2f59c747599c449bfba4e2131aa7c27fed4b500 Mon Sep 17 00:00:00 2001 From: Maximiliano Bertacchini Date: Wed, 10 Jul 2019 17:12:31 +0000 Subject: [PATCH] Drop custom qt5, use distro provided one. --- snap/snapcraft.yaml | 49 +++------------------------------------------ 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 740b6809..52af3671 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -33,56 +33,13 @@ apps: plugs: *plugs parts: - desktop: - plugin: nil - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git desktop-qt5: source: https://github.com/ubuntu/snapcraft-desktop-helpers.git source-subdir: qt plugin: make - make-parameters: ["FLAVOR=qt5"] - build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 # for loading icon themes which are svg - - try: [appmenu-qt5] # not available on core18 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 - qt5: - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: qt - plugin: make - make-parameters: ["FLAVOR=qt5"] - build-packages: - - qtbase5-dev - - dpkg-dev - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 # for loading icon themes which are svg - - try: [appmenu-qt5] # not available on core18 - - locales-all - barrier-kvm: - source: https://github.com/payomagic/barrier.git + + barrier: + source: . plugin: cmake build-packages: - g++