mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-28 08:10:19 +00:00
Drop magick probe from GTK Meson build
This commit is contained in:
9
.github/workflows/flatpak-build.yml
vendored
9
.github/workflows/flatpak-build.yml
vendored
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user