From a4eed31f853e358d95cae6e2bf9c2c459d806f42 Mon Sep 17 00:00:00 2001
From: kz6fittycent <jimmy.tigert@gmail.com>
Date: Tue, 23 Aug 2022 09:39:12 -0500
Subject: [PATCH 1/4] Removing desktop launch

Users mentioned dramatically increased size as a potential problem. I may entertain a separate snap for desktops and this original for servers/simplified deployments.
---
 snap/snapcraft.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e000e9a..1794f17 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -25,8 +25,8 @@ package-repositories:
 apps:
   btop:
     command: usr/local/bin/btop
-    extensions:
-      - gnome-3-38 
+#    extensions:
+#      - gnome-3-38 
     environment:
       LC_ALL: C.UTF-8
       LANG: C.UTF-8
@@ -39,11 +39,11 @@ apps:
       - network-observe
       - home
       - removable-media
-      - desktop
-      - desktop-legacy
-      - x11
-      - wayland
-      - unity7
+#      - desktop
+#      - desktop-legacy
+#      - x11
+#      - wayland
+#      - unity7
 
 parts:
   btop:

From 4dd87b0124c5d4fff49b35f2a841a5a1cfcfab0d Mon Sep 17 00:00:00 2001
From: kz6fittycent <jimmy.tigert@gmail.com>
Date: Tue, 23 Aug 2022 09:43:39 -0500
Subject: [PATCH 2/4] Update snapcraft.yaml

---
 snap/snapcraft.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d45b709..1794f17 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -15,6 +15,8 @@ architectures:
   - build-on: amd64
   - build-on: arm64
   - build-on: armhf
+  - build-on: ppc64el
+  - build-on: s390x
 
 package-repositories:
  - type: apt

From e9e3aabe31186423ce0e11efb40023edc57bb526 Mon Sep 17 00:00:00 2001
From: kz6fittycent <jimmy.tigert@gmail.com>
Date: Tue, 23 Aug 2022 10:24:11 -0500
Subject: [PATCH 3/4] Instructions for btop-desktop

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 3520962..d8da0d5 100644
--- a/README.md
+++ b/README.md
@@ -548,20 +548,28 @@ Also needs a UTF8 locale and a font that covers:
 ## Installing the snap
 [![btop](https://snapcraft.io/btop/badge.svg)](https://snapcraft.io/btop)
 
+### Note: there are now two snaps available: `btop` and `btop-desktop`. The desktop version is much larger and includes the desktop entries needed to allow for launching `btop` with a click.
+
  * **Install the snap**
 
     ```bash
     sudo snap install btop
+    or
+    sudo snap install btop-desktop
     ```
  * **Install the latest snap from the edge channel**
    ```
    sudo snap install btop --edge
+   or
+   sudo snap install btop-desktop --edge
    ```
 
  * **Connect the interface**
 
     ```bash
 	sudo snap connect btop:removable-media
+	or 
+	sudo snap connect btop-desktop:removable-media
 	```
 
 

From 5de351cddab121941487a5509437417537fd8319 Mon Sep 17 00:00:00 2001
From: kz6fittycent <jimmy.tigert@gmail.com>
Date: Tue, 23 Aug 2022 10:28:15 -0500
Subject: [PATCH 4/4] Cleaning up snap

---
 snap/gui/btop.desktop |  11 -----
 snap/gui/icon.svg     | 111 ------------------------------------------
 snap/snapcraft.yaml   |   7 ---
 3 files changed, 129 deletions(-)
 delete mode 100644 snap/gui/btop.desktop
 delete mode 100644 snap/gui/icon.svg

diff --git a/snap/gui/btop.desktop b/snap/gui/btop.desktop
deleted file mode 100644
index 0135a93..0000000
--- a/snap/gui/btop.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=btop++
-GenericName=System Monitor
-Comment=Resource monitor that shows usage and stats for processor, memory, disks, network and processes
-Icon=${SNAP}/meta/gui/icon.svg
-Exec=btop
-Terminal=true
-Categories=System;Monitor;ConsoleOnly;
-Keywords=system;process;task
diff --git a/snap/gui/icon.svg b/snap/gui/icon.svg
deleted file mode 100644
index 402b842..0000000
--- a/snap/gui/icon.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="90"
-   height="90"
-   version="1.1"
-   id="svg70"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs26">
-    <pattern
-       xlink:href="#gray-stripes"
-       id="pattern1888" />
-    <pattern
-       xlink:href="#red-stripes"
-       id="pattern1870" />
-    <pattern
-       id="red-stripes"
-       width="341"
-       height="90"
-       patternUnits="userSpaceOnUse">
-      <rect
-         width="341"
-         height="16"
-         fill="#f00"
-         id="rect2" />
-      <rect
-         y="16"
-         width="341"
-         height="16"
-         fill="#d70000"
-         id="rect4" />
-      <rect
-         y="32"
-         width="341"
-         height="16"
-         fill="#af0000"
-         id="rect6" />
-      <rect
-         y="48"
-         width="341"
-         height="16"
-         fill="#870000"
-         id="rect8" />
-      <rect
-         y="64"
-         width="341"
-         height="16"
-         fill="#5f0000"
-         id="rect10" />
-    </pattern>
-    <pattern
-       id="gray-stripes"
-       width="341"
-       height="90"
-       patternUnits="userSpaceOnUse">
-      <rect
-         width="341"
-         height="16"
-         fill="#585858"
-         id="rect13" />
-      <rect
-         y="16"
-         width="341"
-         height="16"
-         fill="#4e4e4e"
-         id="rect15" />
-      <rect
-         y="32"
-         width="341"
-         height="16"
-         fill="#444"
-         id="rect17" />
-      <rect
-         y="48"
-         width="341"
-         height="16"
-         fill="#3a3a3a"
-         id="rect19" />
-      <rect
-         y="64"
-         width="341"
-         height="16"
-         fill="#303030"
-         id="rect21" />
-      <rect
-         y="80"
-         width="341"
-         height="10"
-         fill="#262626"
-         id="rect23" />
-    </pattern>
-  </defs>
-  <g
-     id="g2074"
-     transform="translate(18)">
-    <path
-       d="M 2,7 V 90 H 47 V 74 h 7 V 55 H 47 V 42 h 7 V 23 H 47 V 7 Z M 19,26 H 37 V 39 H 19 Z m 0,32 H 37 V 71 H 19 Z"
-       id="path28"
-       style="fill:#080808" />
-    <path
-       d="M 2,7 V 90 H 47 V 74 h 7 V 55 H 47 V 42 h 7 V 23 H 47 V 7 Z m 1,1 h 43 v 16 h 7 v 17 h -7 v 15 h 7 V 73 H 46 V 89 H 3 Z M 18,25 H 38 V 40 H 18 Z m 1,1 V 39 H 37 V 26 Z M 18,57 H 38 V 72 H 18 Z m 1,1 V 71 H 37 V 58 Z M 4,9 V 88 H 45 V 72 h 7 V 57 H 45 V 40 h 7 V 25 H 45 V 9 Z m 1,1 h 39 v 16 h 7 v 13 h -7 v 19 h 7 V 71 H 44 V 87 H 5 Z M 16,23 H 40 V 42 H 16 Z m 1,1 V 41 H 39 V 24 Z M 16,55 H 40 V 74 H 16 Z m 1,1 V 73 H 39 V 56 Z"
-       id="path42"
-       style="fill:url(#pattern1888)" />
-    <path
-       d="M 0,0 V 80 H 42 V 64 h 7 V 48 H 42 V 32 h 7 V 16 H 42 V 0 Z M 14,16 H 35 V 32 H 14 Z m 0,32 H 35 V 64 H 14 Z"
-       id="path56"
-       style="fill:url(#pattern1870)" />
-  </g>
-</svg>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1794f17..16978fe 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -25,8 +25,6 @@ package-repositories:
 apps:
   btop:
     command: usr/local/bin/btop
-#    extensions:
-#      - gnome-3-38 
     environment:
       LC_ALL: C.UTF-8
       LANG: C.UTF-8
@@ -39,11 +37,6 @@ apps:
       - network-observe
       - home
       - removable-media
-#      - desktop
-#      - desktop-legacy
-#      - x11
-#      - wayland
-#      - unity7
 
 parts:
   btop: