From d02f06b2bd72778ef5a865a876d338b0afefb2e8 Mon Sep 17 00:00:00 2001 From: ohchase Date: Sat, 23 Nov 2024 14:30:27 -0500 Subject: [PATCH 1/2] flatpak icon support --- .../{haveno.svg => exchange.haveno.Haveno.svg} | 0 desktop/package/linux/Haveno.desktop | 2 +- .../linux/{icon.png => exchange.haveno.Haveno.png} | Bin desktop/package/linux/exchange.haveno.Haveno.yml | 4 ++-- desktop/package/package.gradle | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename desktop/package/linux/Haveno.AppDir/{haveno.svg => exchange.haveno.Haveno.svg} (100%) rename desktop/package/linux/{icon.png => exchange.haveno.Haveno.png} (100%) diff --git a/desktop/package/linux/Haveno.AppDir/haveno.svg b/desktop/package/linux/Haveno.AppDir/exchange.haveno.Haveno.svg similarity index 100% rename from desktop/package/linux/Haveno.AppDir/haveno.svg rename to desktop/package/linux/Haveno.AppDir/exchange.haveno.Haveno.svg diff --git a/desktop/package/linux/Haveno.desktop b/desktop/package/linux/Haveno.desktop index a0e32a6347e..b6d62c222c8 100644 --- a/desktop/package/linux/Haveno.desktop +++ b/desktop/package/linux/Haveno.desktop @@ -3,7 +3,7 @@ Comment=A decentralized, Tor-based, P2P Monero exchange network. Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; bin/Haveno %u" GenericName[en_US]=Monero Exchange GenericName=Monero Exchange -Icon=haveno +Icon=exchange.haveno.Haveno Categories=Office;Finance;Java;P2P; Name[en_US]=Haveno Name=Haveno diff --git a/desktop/package/linux/icon.png b/desktop/package/linux/exchange.haveno.Haveno.png similarity index 100% rename from desktop/package/linux/icon.png rename to desktop/package/linux/exchange.haveno.Haveno.png diff --git a/desktop/package/linux/exchange.haveno.Haveno.yml b/desktop/package/linux/exchange.haveno.Haveno.yml index 2924684435d..1bbd85ad0d5 100644 --- a/desktop/package/linux/exchange.haveno.Haveno.yml +++ b/desktop/package/linux/exchange.haveno.Haveno.yml @@ -22,7 +22,7 @@ modules: - type: file path: package/linux/exchange.haveno.Haveno.metainfo.xml - type: file - path: package/linux/icon.png + path: package/linux/exchange.haveno.Haveno.png build-commands: - ls - pwd @@ -35,7 +35,7 @@ modules: - mkdir -p /app/share/icons/hicolor/128x128/apps/ - mkdir -p /app/share/applications/ - mkdir -p /app/share/metainfo/ - - mv icon.png /app/share/icons/hicolor/128x128/apps/haveno.png + - mv exchange.haveno.Haveno.png /app/share/icons/hicolor/128x128/apps/ - mv Haveno.desktop /app/share/applications/exchange.haveno.Haveno.desktop - mv exchange.haveno.Haveno.metainfo.xml /app/share/metainfo/ diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 65e09d554fa..cdc2d92a9d4 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -306,7 +306,7 @@ task packageInstallers { executeCmd(jPackageFilePath + commonOpts + macOpts + " --type dmg") } else { String linuxOpts = new String( - " --icon ${project(':desktop').projectDir}/package/linux/icon.png" + + " --icon ${project(':desktop').projectDir}/package/linux/exchange.haveno.Haveno.png" + // This defines the first part of the resulting packages (the application name) // deb requires lowercase letters, therefore the application name is written in lowercase " --linux-package-name haveno" + From bb57f9ee8552c4f2a8ca63b978010b94e2cc5393 Mon Sep 17 00:00:00 2001 From: ohchase Date: Sun, 24 Nov 2024 16:36:37 -0500 Subject: [PATCH 2/2] retain icon.png naming and rename on flatpak mv build command --- desktop/package/linux/exchange.haveno.Haveno.yml | 4 ++-- .../linux/{exchange.haveno.Haveno.png => icon.png} | Bin desktop/package/package.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename desktop/package/linux/{exchange.haveno.Haveno.png => icon.png} (100%) diff --git a/desktop/package/linux/exchange.haveno.Haveno.yml b/desktop/package/linux/exchange.haveno.Haveno.yml index 1bbd85ad0d5..50843f8f753 100644 --- a/desktop/package/linux/exchange.haveno.Haveno.yml +++ b/desktop/package/linux/exchange.haveno.Haveno.yml @@ -22,7 +22,7 @@ modules: - type: file path: package/linux/exchange.haveno.Haveno.metainfo.xml - type: file - path: package/linux/exchange.haveno.Haveno.png + path: package/linux/icon.png build-commands: - ls - pwd @@ -35,7 +35,7 @@ modules: - mkdir -p /app/share/icons/hicolor/128x128/apps/ - mkdir -p /app/share/applications/ - mkdir -p /app/share/metainfo/ - - mv exchange.haveno.Haveno.png /app/share/icons/hicolor/128x128/apps/ + - mv icon.png /app/share/icons/hicolor/128x128/apps/exchange.haveno.Haveno.png - mv Haveno.desktop /app/share/applications/exchange.haveno.Haveno.desktop - mv exchange.haveno.Haveno.metainfo.xml /app/share/metainfo/ diff --git a/desktop/package/linux/exchange.haveno.Haveno.png b/desktop/package/linux/icon.png similarity index 100% rename from desktop/package/linux/exchange.haveno.Haveno.png rename to desktop/package/linux/icon.png diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index cdc2d92a9d4..65e09d554fa 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -306,7 +306,7 @@ task packageInstallers { executeCmd(jPackageFilePath + commonOpts + macOpts + " --type dmg") } else { String linuxOpts = new String( - " --icon ${project(':desktop').projectDir}/package/linux/exchange.haveno.Haveno.png" + + " --icon ${project(':desktop').projectDir}/package/linux/icon.png" + // This defines the first part of the resulting packages (the application name) // deb requires lowercase letters, therefore the application name is written in lowercase " --linux-package-name haveno" +