From 615cf78fd9d3b56680bb2213401aa614ec73cb78 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 4 Jan 2026 10:07:35 -0500
Subject: [PATCH] Fix snap build to use latest format

- add x11-related libs to make the program functional.
- additional metadata
- remove desktop-launch
---
 snap/snapcraft.yaml | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 598f07461..740518457 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,4 +1,13 @@
 name: keepassxc
+contact:
+  - team@keepassxc.org
+  - https://keepassxc.org/team
+donation: https://keepassxc.org/donate
+summary: "KeePassXC: Secure, Community-Driven Password Management"
+description: |
+  KeePassXC is an advanced password manager that offers secure storage 
+  in an encrypted database, with a modern, user-friendly experience that 
+  adapts to your desktop environment.
 adopt-info: keepassxc
 grade: stable
 base: core22
@@ -8,18 +17,28 @@ compression: lzo
 apps:
   keepassxc:
     command: usr/bin/keepassxc
-    common-id: org.keepassxc.KeePassXC.desktop
+    desktop: usr/share/applications/org.keepassxc.KeePassXC.desktop
     extensions: [kde-neon]
-    plugs: [home, unity7, network, network-bind, removable-media, raw-usb, password-manager-service, browser-native-messaging]
-    autostart: org.keepassxc.KeePassXC.desktop
+    plugs:
+      - home
+      - unity7
+      - network
+      - network-bind
+      - removable-media
+      - raw-usb
+      - password-manager-service
+      - browser-native-messaging
+
   cli:
     command: usr/bin/keepassxc-cli
     extensions: [kde-neon]
     plugs: [home, removable-media, raw-usb]
+
   proxy:
     command: usr/bin/keepassxc-proxy
     extensions: [kde-neon]
 
+# Enable direct access to the native messaging host configuration files
 plugs:
   browser-native-messaging:
     interface: personal-files
@@ -67,7 +86,6 @@ parts:
       - libfreetype-dev
       - libkeyutils-dev
     stage-packages:
-      - dbus
       - libbotan-2-19
       - libqrencode4
       - libusb-1.0-0
@@ -78,8 +96,19 @@ parts:
       - libfreetype6
       - xclip
       - libkeyutils1
+      - libxkbcommon0
+      - libxkbcommon-x11-0
+      - libxkbfile1
+      - libxcb-cursor0
+      - libxcb-icccm4
+      - libxcb-image0
+      - libxcb-keysyms1
+      - libxcb-render-util0
+      - libxcb-render0
+      - libxcb-shape0
+      - libxcb-xkb1
+
 lint:
   ignore:
     - library:
       - lib/**/libhistory.so*
-