From bb56c8666cebe4bf953277e8150160070f616c5e Mon Sep 17 00:00:00 2001 From: painter <267173835+painter4supersonicx@users.noreply.github.com> Date: Sun, 26 Apr 2026 15:30:02 -0700 Subject: [PATCH] Make meson happen --- .github/workflows/build-omv.yml | 3 ++- meson.build | 2 +- meson_options.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-omv.yml b/.github/workflows/build-omv.yml index a8a09016..6560c6db 100644 --- a/.github/workflows/build-omv.yml +++ b/.github/workflows/build-omv.yml @@ -32,7 +32,8 @@ jobs: lib64asound-devel \ lib64pulseaudio-devel \ lib64sndio-devel \ - lib64pango1.0-devel + lib64pango1.0-devel \ + git - name: Configure Meson run: | diff --git a/meson.build b/meson.build index cf882ec2..5e51e893 100644 --- a/meson.build +++ b/meson.build @@ -453,7 +453,7 @@ conf_data.set_quoted('VERSION', '1.0.31') # Generate version.h (similar to Makefile.am) # Uses git describe if .git-src exists, otherwise uses project version # Check for .git-src file existence using run_command -git_src_check = run_command('test', '-f', '.git-src').returncode() +git_src_check = run_command('test', '-f', '.git-src', check: false).returncode() if git_src_check == 0 # Try to get git describe output git_version = run_command('git', 'describe', '--dirty', check: false).stdout().strip() diff --git a/meson_options.txt b/meson_options.txt index 93682a3b..1c65f9cf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -31,7 +31,7 @@ option('sndldr', type: 'combo', value: 'sndfile', choices: ['sndfile', 'audiofil # Other features option('enable-sm', type: 'boolean', value: true, description: 'Enable session management support') -option('enable-pango', type: 'boolean', value: true, description: 'Enable Pango-XFT support') +option('enable-pango', type: 'boolean', value: false, description: 'Enable Pango-XFT support (currently broken)') option('enable-libhack', type: 'boolean', value: true, description: 'Build window mode helper library') option('enable-libtrip', type: 'boolean', value: false, description: 'Build debug library') option('enable-dialogs', type: 'boolean', value: true, description: 'Enable configuration dialogs support')