Skip to content

Commit

Permalink
chore(linux): Fix meson version
Browse files Browse the repository at this point in the history
Due to a bug in reconf.sh we previously didn't configure
keyman-system-service when creating the source package. After
adding keyman-system-service as a dependency to ibus-keyman this
now gets configured, but on the stock Ubuntu 22.04 that we use for
the "Build source package" GHA job we only have the stock meson
version (0.61), so we use that as minimum version. We can use that
version even though we still support Ubuntu 20.04 Focal which comes
with 0.53, but that is build in a separate chroot that has access to
llso which has a 1.0 package.
  • Loading branch information
ermshiperete committed Sep 21, 2023
1 parent da39bc7 commit 5d074b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion linux/keyman-system-service/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('keyman-system-service', 'c', 'cpp',
version: run_command('cat', '../../VERSION.md', check: true).stdout().strip(),
license: 'GPL-2+',
meson_version: '>=1.0')
meson_version: '>=0.61')

evdev = dependency('libevdev', version: '>= 1.9')
systemd = dependency('libsystemd')
Expand Down
5 changes: 3 additions & 2 deletions linux/scripts/reconf.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -e
set -eu

## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
Expand All @@ -17,13 +17,14 @@ echo "Found tier ${TIER}, version ${VERSION}"
cd ../core
./build.sh --no-tests clean:arch configure:arch build:arch

# Building ibus-keyman will also build dependency keyman-system-service
cd "$BASEDIR/ibus-keyman"
./build.sh clean configure

cd "$BASEDIR/keyman-config"
./build.sh clean

cd keyman_config
cd "$BASEDIR/keyman-config/keyman_config"
sed \
-e "s/_VERSION_/${VERSION}/g" \
-e "s/_VERSIONWITHTAG_/${VERSION_WITH_TAG}/g" \
Expand Down

0 comments on commit 5d074b0

Please sign in to comment.