From a3b733aa1e3a4c95d0d2eaf40f895cec406ff3f0 Mon Sep 17 00:00:00 2001 From: NBA2K1 <78034913+NBA2K1@users.noreply.github.com> Date: Wed, 16 Jul 2025 06:59:18 +0200 Subject: [PATCH] Use icons from macOS folder instead of converting on-the-fly --- .github/workflows/release.yml | 10 ++++------ .../appimage/icons/hicolor/128x128/apps/mangayomi.png | 1 + .../appimage/icons/hicolor/16x16/apps/mangayomi.png | 1 + .../appimage/icons/hicolor/256x256/apps/mangayomi.png | 1 + .../appimage/icons/hicolor/32x32/apps/mangayomi.png | 1 + .../appimage/icons/hicolor/512x512/apps/mangayomi.png | 1 + .../appimage/icons/hicolor/64x64/apps/mangayomi.png | 1 + 7 files changed, 10 insertions(+), 6 deletions(-) create mode 120000 linux/packaging/appimage/icons/hicolor/128x128/apps/mangayomi.png create mode 120000 linux/packaging/appimage/icons/hicolor/16x16/apps/mangayomi.png create mode 120000 linux/packaging/appimage/icons/hicolor/256x256/apps/mangayomi.png create mode 120000 linux/packaging/appimage/icons/hicolor/32x32/apps/mangayomi.png create mode 120000 linux/packaging/appimage/icons/hicolor/512x512/apps/mangayomi.png create mode 120000 linux/packaging/appimage/icons/hicolor/64x64/apps/mangayomi.png diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6076bac..df097743 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -258,7 +258,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install webkit2gtk-4.1 clang cmake ninja-build pkg-config libgtk-3-dev mpv libmpv-dev dpkg-dev libblkid-dev liblzma-dev fuse rpm imagemagick + sudo apt-get install webkit2gtk-4.1 clang cmake ninja-build pkg-config libgtk-3-dev mpv libmpv-dev dpkg-dev libblkid-dev liblzma-dev fuse rpm wget -O /usr/local/bin/linuxdeploy "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" chmod +x /usr/local/bin/linuxdeploy @@ -291,11 +291,10 @@ jobs: # Create fresh AppDir structure rm -rf AppDir mkdir -p AppDir/usr/bin - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps + mkdir -p AppDir/usr/share/icons/hicolor # Copy built files cp -r build/linux/x64/release/bundle/* AppDir/usr/bin/ - convert -resize 256x256 assets/app_icons/icon-red.png AppDir/usr/share/icons/hicolor/256x256/apps/mangayomi.png - convert -resize 512x512 assets/app_icons/icon-red.png AppDir/mangayomi.png + cp -rL linux/packaging/appimage/icons/hicolor/* AppDir/usr/share/icons/hicolor # Create desktop file in AppDir root cp linux/mangayomi.desktop AppDir/mangayomi.desktop # Create AppRun file @@ -312,7 +311,7 @@ jobs: /usr/local/bin/linuxdeploy \ --appdir AppDir \ --desktop-file AppDir/mangayomi.desktop \ - --icon-file AppDir/mangayomi.png \ + --icon-file AppDir/usr/share/icons/hicolor/512x512/apps/mangayomi.png \ --executable AppDir/usr/bin/mangayomi \ --output appimage mv $(find . -type f -name "*.AppImage") build/linux/x64/release/Mangayomi-${{ github.ref_name }}-linux.AppImage @@ -421,7 +420,6 @@ jobs: # Set correct permissions chmod 644 extracted_deb/usr/share/applications/mangayomi.desktop # Repack the .deb - sudo apt-get install -y fakeroot fakeroot dpkg-deb -b extracted_deb dist/Mangayomi-${{ github.ref_name }}-linux.deb - name: upload artifact linux deb diff --git a/linux/packaging/appimage/icons/hicolor/128x128/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/128x128/apps/mangayomi.png new file mode 120000 index 00000000..1a4f842d --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/128x128/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png \ No newline at end of file diff --git a/linux/packaging/appimage/icons/hicolor/16x16/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/16x16/apps/mangayomi.png new file mode 120000 index 00000000..96cf392f --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/16x16/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png \ No newline at end of file diff --git a/linux/packaging/appimage/icons/hicolor/256x256/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/256x256/apps/mangayomi.png new file mode 120000 index 00000000..c9eae2f2 --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/256x256/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png \ No newline at end of file diff --git a/linux/packaging/appimage/icons/hicolor/32x32/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/32x32/apps/mangayomi.png new file mode 120000 index 00000000..6099a555 --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/32x32/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png \ No newline at end of file diff --git a/linux/packaging/appimage/icons/hicolor/512x512/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/512x512/apps/mangayomi.png new file mode 120000 index 00000000..1f5d72ef --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/512x512/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png \ No newline at end of file diff --git a/linux/packaging/appimage/icons/hicolor/64x64/apps/mangayomi.png b/linux/packaging/appimage/icons/hicolor/64x64/apps/mangayomi.png new file mode 120000 index 00000000..947d1a7a --- /dev/null +++ b/linux/packaging/appimage/icons/hicolor/64x64/apps/mangayomi.png @@ -0,0 +1 @@ +../../../../../../../macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png \ No newline at end of file