From 3182538125012e4a64a8b1dd916f12942a897dc1 Mon Sep 17 00:00:00 2001 From: Jacob Parnell Date: Mon, 25 Nov 2024 01:05:06 -0600 Subject: [PATCH] Update Signal patch --- .gitignore | 2 +- PKGBUILD | 26 +++--- signal-32.patch | 62 --------------- signal.patch | 204 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+), 75 deletions(-) delete mode 100644 signal-32.patch create mode 100644 signal.patch diff --git a/.gitignore b/.gitignore index dcededc..6a6da53 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ !90-hardcode-tray.hook !hook.py !doasuser.patch -!signal-32.patch +!signal.patch diff --git a/PKGBUILD b/PKGBUILD index 0162c48..c1d1a33 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Bilal Elmoussaoui pkgname=hardcode-tray-git pkgver=4.3.r246.g1d52b2c -pkgrel=1 +pkgrel=2 pkgdesc="Fixes hardcoded tray icons" arch=('x86_64') url="https://github.com/bil-elmoussaoui/Hardcode-Tray" @@ -11,20 +11,22 @@ license=('GPL3') depends=('gtk3' 'librsvg' 'python-cairosvg' 'python-gobject') makedepends=('git' 'gobject-introspection' 'meson') optdepends=('nodejs-svgexport: option to convert svg to png' - 'imagemagick: option to convert svg to png' - 'inkscape: option to convert svg to png') + 'imagemagick: option to convert svg to png' + 'inkscape: option to convert svg to png') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=("${pkgname%-git}::git+https://github.com/bil-elmoussaoui/Hardcode-Tray.git" - "90-${pkgname%-git}.hook" - "hook.py" - "doasuser.patch" - "signal-32.patch") + "90-${pkgname%-git}.hook" + "hook.py" + "doasuser.patch" + "signal.patch" +) sha256sums=('SKIP' - 'c16ba6a82d4fe523cb91bf472b44296db82ff301866e3bce18bb4149d0aae5ea' - '64a9907f74c5c04fb9f32b2b0684a3ce040d3bc2baacabb3ca1e914d70f24c81' - '8f567656707f3e1bc534f2b30b0f87a1b9df9372be27788b61044a54fec90045' - 'abd25a8431141873c04741b0a9142dd9c33aaa0e436c2f7b933b8dcdda79c240') + 'c16ba6a82d4fe523cb91bf472b44296db82ff301866e3bce18bb4149d0aae5ea' + '64a9907f74c5c04fb9f32b2b0684a3ce040d3bc2baacabb3ca1e914d70f24c81' + '8f567656707f3e1bc534f2b30b0f87a1b9df9372be27788b61044a54fec90045' + 'a8538fc288b199ec9e8e958fbd517946cd0a29b818dd9be21e5c81719a3ea4f4' +) pkgver() { cd "$srcdir/${pkgname%-git}" @@ -40,7 +42,7 @@ prepare() { # Add doas support patch --forward --strip=1 --input="${srcdir}/doasuser.patch" - patch --forward --strip=1 --input="${srcdir}/signal-32.patch" + patch --forward --strip=1 --input="${srcdir}/signal.patch" } build() { diff --git a/signal-32.patch b/signal-32.patch deleted file mode 100644 index 24b06b6..0000000 --- a/signal-32.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --unified --recursive --text hardcode-tray.orig/data/database/signal.electron.json hardcode-tray.new/data/database/signal.electron.json ---- hardcode-tray.orig/data/database/signal.electron.json 2023-12-15 00:49:29.825065862 -0600 -+++ hardcode-tray.new/data/database/signal.electron.json 2023-12-15 00:50:20.745044832 -0600 -@@ -14,47 +14,47 @@ - "script": "electron", - "icons": { - "tray": { -- "original": "images/icon_256.png", -+ "original": "images/icon_32.png", - "theme": "signal-tray" - }, - "tray-unread-1": { -- "original": "images/alert/256/1.png", -+ "original": "images/alert/32/1.png", - "theme": "signal-unread-1" - }, - "tray-unread-2": { -- "original": "images/alert/256/2.png", -+ "original": "images/alert/32/2.png", - "theme": "signal-unread-2" - }, - "tray-unread-3": { -- "original": "images/alert/256/3.png", -+ "original": "images/alert/32/3.png", - "theme": "signal-unread-3" - }, - "tray-unread-4": { -- "original": "images/alert/256/4.png", -+ "original": "images/alert/32/4.png", - "theme": "signal-unread-4" - }, - "tray-unread-5": { -- "original": "images/alert/256/5.png", -+ "original": "images/alert/32/5.png", - "theme": "signal-unread-5" - }, - "tray-unread-6": { -- "original": "images/alert/256/6.png", -+ "original": "images/alert/32/6.png", - "theme": "signal-unread-6" - }, - "tray-unread-7": { -- "original": "images/alert/256/7.png", -+ "original": "images/alert/32/7.png", - "theme": "signal-unread-7" - }, - "tray-unread-8": { -- "original": "images/alert/256/8.png", -+ "original": "images/alert/32/8.png", - "theme": "signal-unread-8" - }, - "tray-unread-9": { -- "original": "images/alert/256/9.png", -+ "original": "images/alert/32/9.png", - "theme": "signal-unread-9" - }, - "tray-10": { -- "original": "images/alert/256/10.png", -+ "original": "images/alert/32/10.png", - "theme": "signal-unread-10" - } - } diff --git a/signal.patch b/signal.patch new file mode 100644 index 0000000..4d8c17a --- /dev/null +++ b/signal.patch @@ -0,0 +1,204 @@ +diff -ura hardcode-tray.orig/data/database/signal.electron.json hardcode-tray.new/data/database/signal.electron.json +--- hardcode-tray.orig/data/database/signal.electron.json 2024-11-21 21:38:10.769021850 -0600 ++++ hardcode-tray.new/data/database/signal.electron.json 2024-11-21 21:44:59.077783774 -0600 +@@ -14,47 +14,179 @@ + "script": "electron", + "icons": { + "tray": { +- "original": "images/icon_256.png", ++ "original": "images/tray-icons/base/signal-tray-icon-16x16-base.png", + "theme": "signal-tray" + }, +- "tray-unread-1": { +- "original": "images/alert/256/1.png", ++ "tray-2": { ++ "original": "images/tray-icons/base/signal-tray-icon-32x32-base.png", ++ "theme": "signal-tray" ++ }, ++ "tray-3": { ++ "original": "images/tray-icons/base/signal-tray-icon-48x48-base.png", ++ "theme": "signal-tray" ++ }, ++ "tray-4": { ++ "original": "images/tray-icons/base/signal-tray-icon-256x256-base.png", ++ "theme": "signal-tray" ++ }, ++ "tray-unread-16-1": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-1.png", ++ "theme": "signal-unread-1" ++ }, ++ "tray-unread-16-2": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-2.png", ++ "theme": "signal-unread-2" ++ }, ++ "tray-unread-16-3": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-3.png", ++ "theme": "signal-unread-3" ++ }, ++ "tray-unread-16-4": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-4.png", ++ "theme": "signal-unread-4" ++ }, ++ "tray-unread-16-5": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-5.png", ++ "theme": "signal-unread-5" ++ }, ++ "tray-unread-16-6": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-6.png", ++ "theme": "signal-unread-6" ++ }, ++ "tray-unread-16-7": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-7.png", ++ "theme": "signal-unread-7" ++ }, ++ "tray-unread-16-8": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-8.png", ++ "theme": "signal-unread-8" ++ }, ++ "tray-unread-16-9": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-9.png", ++ "theme": "signal-unread-9" ++ }, ++ "tray-unread-16-9+": { ++ "original": "images/tray-icons/alert/signal-tray-icon-16x16-alert-9+.png", ++ "theme": "signal-unread-10" ++ }, ++ "tray-unread-32-1": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-1.png", ++ "theme": "signal-unread-1" ++ }, ++ "tray-unread-32-2": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-2.png", ++ "theme": "signal-unread-2" ++ }, ++ "tray-unread-32-3": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-3.png", ++ "theme": "signal-unread-3" ++ }, ++ "tray-unread-32-4": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-4.png", ++ "theme": "signal-unread-4" ++ }, ++ "tray-unread-32-5": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-5.png", ++ "theme": "signal-unread-5" ++ }, ++ "tray-unread-32-6": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-6.png", ++ "theme": "signal-unread-6" ++ }, ++ "tray-unread-32-7": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-7.png", ++ "theme": "signal-unread-7" ++ }, ++ "tray-unread-32-8": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-8.png", ++ "theme": "signal-unread-8" ++ }, ++ "tray-unread-32-9": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-9.png", ++ "theme": "signal-unread-9" ++ }, ++ "tray-unread-32-9+": { ++ "original": "images/tray-icons/alert/signal-tray-icon-32x32-alert-9+.png", ++ "theme": "signal-unread-10" ++ }, ++ "tray-unread-48-1": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-1.png", ++ "theme": "signal-unread-1" ++ }, ++ "tray-unread-48-2": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-2.png", ++ "theme": "signal-unread-2" ++ }, ++ "tray-unread-48-3": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-3.png", ++ "theme": "signal-unread-3" ++ }, ++ "tray-unread-48-4": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-4.png", ++ "theme": "signal-unread-4" ++ }, ++ "tray-unread-48-5": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-5.png", ++ "theme": "signal-unread-5" ++ }, ++ "tray-unread-48-6": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-6.png", ++ "theme": "signal-unread-6" ++ }, ++ "tray-unread-48-7": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-7.png", ++ "theme": "signal-unread-7" ++ }, ++ "tray-unread-48-8": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-8.png", ++ "theme": "signal-unread-8" ++ }, ++ "tray-unread-48-9": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-9.png", ++ "theme": "signal-unread-9" ++ }, ++ "tray-unread-48-9+": { ++ "original": "images/tray-icons/alert/signal-tray-icon-48x48-alert-9+.png", ++ "theme": "signal-unread-10" ++ }, ++ "tray-unread-256-1": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-1.png", + "theme": "signal-unread-1" + }, +- "tray-unread-2": { +- "original": "images/alert/256/2.png", ++ "tray-unread-256-2": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-2.png", + "theme": "signal-unread-2" + }, +- "tray-unread-3": { +- "original": "images/alert/256/3.png", ++ "tray-unread-256-3": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-3.png", + "theme": "signal-unread-3" + }, +- "tray-unread-4": { +- "original": "images/alert/256/4.png", ++ "tray-unread-256-4": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-4.png", + "theme": "signal-unread-4" + }, +- "tray-unread-5": { +- "original": "images/alert/256/5.png", ++ "tray-unread-256-5": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-5.png", + "theme": "signal-unread-5" + }, +- "tray-unread-6": { +- "original": "images/alert/256/6.png", ++ "tray-unread-256-6": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-6.png", + "theme": "signal-unread-6" + }, +- "tray-unread-7": { +- "original": "images/alert/256/7.png", ++ "tray-unread-256-7": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-7.png", + "theme": "signal-unread-7" + }, +- "tray-unread-8": { +- "original": "images/alert/256/8.png", ++ "tray-unread-256-8": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-8.png", + "theme": "signal-unread-8" + }, +- "tray-unread-9": { +- "original": "images/alert/256/9.png", ++ "tray-unread-256-9": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-9.png", + "theme": "signal-unread-9" + }, +- "tray-10": { +- "original": "images/alert/256/10.png", ++ "tray-unread-256-9+": { ++ "original": "images/tray-icons/alert/signal-tray-icon-256x256-alert-9+.png", + "theme": "signal-unread-10" + } + }