From abecf9c959c8cf7ed88d3149ff879307911b0fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Soto?= <jesus.soto@canonical.com>
Date: Thu, 18 Jul 2024 10:40:28 -0600
Subject: [PATCH 1/2] build: update to core24

---
 snapcraft.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index da017b9..2cdef15 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -12,10 +12,10 @@ description: |
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
-base: core22
+base: core24
 
 build-snaps:
-  - gnome-42-2204/latest/candidate
+  - gnome-46-2404/latest/candidate
 
 plugs:
   run-systemd-sessions:
@@ -45,6 +45,7 @@ apps:
     desktop: usr/share/applications/gnome-system-monitor.desktop
     common-id: gnome-system-monitor.desktop
 
+
 parts:
   gnome-system-monitor:
 # ext:updatesnap
@@ -80,6 +81,8 @@ parts:
       - yelp-tools
     stage-packages:
       - libsigc++-2.0-0v5
+    build-snaps:
+      - gnome-46-2404-sdk/latest/candidate
 
   # workaround snapcraft trying to outsmart us by copying ldd listed libraries
   libraries:
@@ -96,9 +99,9 @@ parts:
   cleanup:
     after: [libraries]
     plugin: nil
-    build-snaps: [core22, gnome-42-2204]
+    build-snaps: [core24, gnome-46-2404]
     override-prime: |
       set -eux
-      for snap in "core22" "gnome-42-2204"; do
+      for snap in "core24" "gnome-46-2404"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done

From 258d403b844bd05bef28d19956e91e51cd1bd2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Soto?= <jesus.soto@canonical.com>
Date: Thu, 18 Jul 2024 10:42:02 -0600
Subject: [PATCH 2/2] build: update desktop files to match upstream changes

---
 snapcraft.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2cdef15..a46e314 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,9 +42,8 @@ apps:
       - system-observe
       - process-control
       - run-systemd-sessions
-    desktop: usr/share/applications/gnome-system-monitor.desktop
-    common-id: gnome-system-monitor.desktop
-
+    desktop: usr/share/applications/org.gnome.SystemMonitor.desktop
+    common-id: org.gnome.SystemMonitor.desktop
 
 parts:
   gnome-system-monitor:
@@ -64,12 +63,12 @@ parts:
     override-pull: |
       craftctl default
       craftctl set version=$(git describe --tags --abbrev=10)
-      sed -i.bak -e 's|Icon=org.gnome.SystemMonitor$|Icon=${SNAP}/meta/gui/org.gnome.SystemMonitor.svg|g' gnome-system-monitor.desktop.in
-      sed -i.bak -E -e 's|^(NotShowIn=.*)$|# \1|g' gnome-system-monitor.desktop.in
+      sed -i.bak -e 's|Icon=@APP_ID@$|Icon=${SNAP}/meta/gui/org.gnome.SystemMonitor.svg|g'  ./data/org.gnome.SystemMonitor.desktop.in.in
+      sed -i.bak -E -e 's|^(NotShowIn=.*)$|# \1|g' ./data/org.gnome.SystemMonitor.desktop.in.in
     override-build: |
       craftctl default
       mkdir -p $CRAFT_PART_INSTALL/meta/gui/
-      cp $CRAFT_PART_BUILD/gnome-system-monitor.desktop $CRAFT_PART_INSTALL/meta/gui/
+      cp $CRAFT_PART_BUILD/data/org.gnome.SystemMonitor.desktop $CRAFT_PART_INSTALL/meta/gui/
       cp $CRAFT_PART_SRC/data/icons/public/hicolor/scalable/apps/org.gnome.SystemMonitor.svg $CRAFT_PART_INSTALL/meta/gui/
     build-packages:
       - desktop-file-utils