From c88390e3be26568d2f5d19b9e18f37bded935c83 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 28 Aug 2018 15:11:16 -0400
Subject: [PATCH] Support building snaps on Ubuntu 18.04 and Launchpad

---
 snapcraft.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 21e33c44..25baf676 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,11 +7,12 @@ description: |
   personal data management. It has a light interface, is cross-platform and
   published under the terms of the GNU General Public License.
 confinement: strict
+base: core18
 
 apps:
   keepassxc:
     command: desktop-launch keepassxc
-    plugs: [unity7, x11, opengl, gsettings, home, network, network-bind, removable-media, raw-usb]
+    plugs: [unity7, x11, opengl, gsettings, home, network, network-bind, removable-media, raw-usb, wayland, desktop-legacy]
     desktop: usr/share/applications/org.keepassxc.KeePassXC.desktop
   cli:
     command: keepassxc-cli
@@ -27,8 +28,6 @@ parts:
     configflags:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_LIBRARY_PATH=/opt/keepassxc-libs/lib/x86_64-linux-gnu
-      - -DCMAKE_INCLUDE_PATH=/opt/keepassxc-libs/include
       - -DKEEPASSXC_DIST_TYPE=Snap
       - -DKEEPASSXC_BUILD_TYPE=Release
       - -DWITH_TESTS=OFF
@@ -50,20 +49,19 @@ parts:
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations
-      - libgcrypt20-18
+      - libgcrypt20
       - libykpers-1-1
       - libargon2-0
       - libsodium23
       - libxtst6
       - libqt5x11extras5
       - libusb-1.0-0
+      - qtwayland5
     override-build: |
       snapcraftctl build
       sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.KeePassXC.desktop
     organize:
       usr/share/qt5/translations/*.qm: usr/share/keepassxc/translations/
-      opt/keepassxc-libs/lib/x86_64-linux-gnu/*: usr/lib/x86_64-linux-gnu/
-      opt/keepassxc-libs/share/locale/*: usr/share/locale/
     stage:
       - -opt
     after: [desktop-qt5]