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 1/3] 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 21e33c44b..25baf676a 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]

From 4ce42fa6d420bc46ae9c6640971acc325130a1d6 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 28 Aug 2018 21:30:56 -0400
Subject: [PATCH 2/3] Bumped version number to 2.4.0-preview

---
 CHANGELOG                                       | 6 ++++++
 CMakeLists.txt                                  | 4 ++--
 share/linux/org.keepassxc.KeePassXC.appdata.xml | 7 +++++++
 snapcraft.yaml                                  | 4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 20545c443..4c29e968e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+2.4.0-preview (TBD)
+=========================
+
+This is a pre-release build, view merged PR's at
+https://github.com/keepassxreboot/keepassxc/pulls?q=is%3Apr+milestone%3Av2.4.0+is%3Aclosed
+
 2.3.4 (2018-08-21)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cac3cc9d..7be9e3013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,8 @@ endif()
 set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "4")
+set(KEEPASSXC_VERSION_MINOR "4")
+set(KEEPASSXC_VERSION_PATCH "0")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 554bcdefa..cf9d499bf 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,13 @@
     </screenshots>
 
     <releases>
+        <release version="2.4.0-preview" date="TBD">
+            <description>
+                <p>
+                This is a pre-release build, <a href="https://github.com/keepassxreboot/keepassxc/pulls?q=is%3Apr+milestone%3Av2.4.0+is%3Aclosed">click to view merged PR's</a>                
+                </p>
+            </description>
+        </release>
         <release version="2.3.4" date="2018-08-21">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 25baf676a..d67c366d4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.4
+version: 2.4.0
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
@@ -29,7 +29,7 @@ parts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DKEEPASSXC_DIST_TYPE=Snap
-      - -DKEEPASSXC_BUILD_TYPE=Release
+      - -DKEEPASSXC_BUILD_TYPE=PreRelease
       - -DWITH_TESTS=OFF
       - -DWITH_XC_ALL=ON
     build-packages:

From c8f18e49f1a68bb757f276c195351efb292d9bea Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 1 Sep 2018 12:29:41 -0400
Subject: [PATCH 3/3] Disable Wayland due to Qt bug

https://forum.snapcraft.io/t/problem-launching-qt-snaps-in-wayland/7055/5
---
 snapcraft.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index d67c366d4..d9321d748 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,6 +14,8 @@ apps:
     command: desktop-launch keepassxc
     plugs: [unity7, x11, opengl, gsettings, home, network, network-bind, removable-media, raw-usb, wayland, desktop-legacy]
     desktop: usr/share/applications/org.keepassxc.KeePassXC.desktop
+    environment:
+      DISABLE_WAYLAND: 1
   cli:
     command: keepassxc-cli
     plugs: [gsettings, home, removable-media, raw-usb]
@@ -34,7 +36,7 @@ parts:
       - -DWITH_XC_ALL=ON
     build-packages:
       - g++
-      - libgcrypt20-18-dev
+      - libgcrypt20-dev
       - libqt5x11extras5-dev
       - qtbase5-dev
       - qttools5-dev