From 6d00a2d40fe887b0a8017d6a6129a6b0fac70222 Mon Sep 17 00:00:00 2001
From: Tracey Clark <kdedev@tlcnet.info>
Date: Tue, 24 Dec 2024 10:19:25 -0600
Subject: [PATCH] snapd: bugfix: Fix formatting error and change to critical

**Summary**
Fix text to be two lines not three per spec
Change urgency to critical so users must manually dismiss the notification
to give them time to copy the link

Resolves #4636
---
 packages/s/snapd/files/wrapper.sh | 11 +++++++----
 packages/s/snapd/package.yml      |  2 +-
 packages/s/snapd/pspec_x86_64.xml | 12 ++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/s/snapd/files/wrapper.sh b/packages/s/snapd/files/wrapper.sh
index 53662a5b17a..22ef39720e4 100644
--- a/packages/s/snapd/files/wrapper.sh
+++ b/packages/s/snapd/files/wrapper.sh
@@ -29,15 +29,18 @@ fi
 
 if [[ "${CONFINEMENT}" != "strict" ]] && [[ "${DISABLE_CONFINEMENT_WARNING:-n}" != "y" ]]
   then
-  if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]
+  # This prevents the warning from showing on KDE Plasma
+  # if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]
+
+  if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]]
   then
       notify-send \
           --app-name Snap \
-          --urgency normal \
+          --urgency critical \
           --icon dialog-warning \
           "Snap has ${CONFINEMENT} confinement" \
-          "Snaps will stop working in early January 2025." \
-          "See ${URL} for details."
+          "Snaps will stop working in early January 2025. For details see<br> \
+          ${URL}"
   else
       echo -e "${YELLOW}WARNING:${NC} snap is running with ${CONFINEMENT} confinement." \
         "Snaps will stop working in early January 2025." \
diff --git a/packages/s/snapd/package.yml b/packages/s/snapd/package.yml
index 856ef42869c..c166b0ea7f2 100644
--- a/packages/s/snapd/package.yml
+++ b/packages/s/snapd/package.yml
@@ -1,7 +1,7 @@
 name       : snapd
 version    : 2.63
 homepage   : https://snapcraft.io/
-release    : 83
+release    : 84
 source     :
     - https://github.com/snapcore/snapd/releases/download/2.63/snapd_2.63.vendor.tar.xz : 2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab
 license    : GPL-3.0-only
diff --git a/packages/s/snapd/pspec_x86_64.xml b/packages/s/snapd/pspec_x86_64.xml
index 7e063cdad4d..f4de5468d20 100644
--- a/packages/s/snapd/pspec_x86_64.xml
+++ b/packages/s/snapd/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>snapd</Name>
         <Homepage>https://snapcraft.io/</Homepage>
         <Packager>
-            <Name>David Harder</Name>
-            <Email>david@davidjharder.ca</Email>
+            <Name>Tracey Clark</Name>
+            <Email>traceyc.dev@tlcnet.info</Email>
         </Packager>
         <License>GPL-3.0-only</License>
         <PartOf>desktop</PartOf>
@@ -77,12 +77,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="83">
-            <Date>2024-12-20</Date>
+        <Update release="84">
+            <Date>2024-12-24</Date>
             <Version>2.63</Version>
             <Comment>Packaging update</Comment>
-            <Name>David Harder</Name>
-            <Email>david@davidjharder.ca</Email>
+            <Name>Tracey Clark</Name>
+            <Email>traceyc.dev@tlcnet.info</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file