From 2e2eea4a461841e3b1e4427ad5ade9727a562557 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub Date: Sat, 28 Mar 2026 00:53:20 -0600 Subject: [PATCH] Drop magick probe from GTK Meson build --- .github/workflows/flatpak-build.yml | 9 --------- data/icons/generate_icons.py | 1 - data/icons/meson.build | 2 +- src/fe-gtk/meson.build | 2 -- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 465907c4..fc46a646 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -25,15 +25,6 @@ jobs: with: submodules: true - - name: Install ImageMagick - run: | - apt-get update - apt-get install -y --no-install-recommends imagemagick - if ! command -v magick >/dev/null 2>&1 && command -v convert >/dev/null 2>&1; then - printf '%s\n' '#!/bin/sh' 'exec convert "$@"' > /usr/local/bin/magick - chmod +x /usr/local/bin/magick - fi - - name: Build Flatpak id: flatpak_builder uses: flatpak/flatpak-github-actions/flatpak-builder@v6 diff --git a/data/icons/generate_icons.py b/data/icons/generate_icons.py index 73437979..e6913c7e 100644 --- a/data/icons/generate_icons.py +++ b/data/icons/generate_icons.py @@ -106,7 +106,6 @@ def parse_args(): def main(): args = parse_args() - magick_cmd() svg = pathlib.Path(args.input_svg) out_png = pathlib.Path(args.output_png) out_png.parent.mkdir(parents=True, exist_ok=True) diff --git a/data/icons/meson.build b/data/icons/meson.build index 2891c5d8..2183b462 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,5 +1,5 @@ icon_gen = find_program('generate_icons.py') -find_program('magick', required: true) +find_program('magick', required: host_machine.system() == 'windows') icondir = join_paths(get_option('datadir'), 'icons/hicolor') custom_target('zoitechat_png', diff --git a/src/fe-gtk/meson.build b/src/fe-gtk/meson.build index d80609a7..6814c175 100644 --- a/src/fe-gtk/meson.build +++ b/src/fe-gtk/meson.build @@ -117,8 +117,6 @@ if get_option('plugin') zoitechat_gtk_sources += 'plugingui.c' endif -find_program('magick', required: true) - zoitechat_png_generated = custom_target('zoitechat_resource_png', input: '../../data/icons/zoitechat.svg', output: 'zoitechat.png',