From 3d8cf1830bc412ec9cad92d4f7615e3d696467f2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 20 Sep 2023 20:09:21 +0200
Subject: [PATCH] chore(linux): Add dependency to build.sh

For integration tests ibus-keyman requires keyman-system-service to
be built, so we add this as a dependency.
---
 linux/debian/rules                      | 12 ++++++------
 linux/ibus-keyman/build.sh              |  1 +
 linux/keyman-system-service/meson.build |  2 +-
 linux/scripts/reconf.sh                 |  5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/linux/debian/rules b/linux/debian/rules
index 44d0cc6dbff..1abfbf004ae 100755
--- a/linux/debian/rules
+++ b/linux/debian/rules
@@ -30,17 +30,17 @@ override_dh_auto_configure:
 		--wrap-mode=nodownload --prefix=/usr --sysconfdir=/etc \
 		--localstatedir=/var --libdir=lib/$(DEB_TARGET_MULTIARCH) \
 		--libexecdir=lib/$(DEB_TARGET_MULTIARCH)
-	linux/ibus-keyman/build.sh configure -- \
-		--wrap-mode=nodownload --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 	linux/keyman-system-service/build.sh configure -- \
 		--wrap-mode=nodownload --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+	linux/ibus-keyman/build.sh configure -- \
+		--wrap-mode=nodownload --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 	linux/keyman-config/build.sh configure
 
 override_dh_auto_build:
 	cp linux/keyman-config/resources/keyman.sharedmimeinfo debian/
 	core/build.sh --no-tests build:arch
-	linux/ibus-keyman/build.sh build
 	linux/keyman-system-service/build.sh build
+	linux/ibus-keyman/build.sh build
 	linux/keyman-config/build.sh build
 	cd linux/keyman-config && \
 		sed -i -e "s/^__pkgversion__ = \"[^\"]*\"/__pkgversion__ = \"$(DEB_VERSION)\"/g" keyman_config/version.py && \
@@ -49,16 +49,16 @@ override_dh_auto_build:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	core/build.sh --no-tests test:arch
-	linux/ibus-keyman/build.sh test
 	linux/keyman-system-service/build.sh test
+	linux/ibus-keyman/build.sh test
 	linux/keyman-config/build.sh test
 endif
 
 override_dh_auto_install:
 	install -d $(CURDIR)/debian/tmp
 	DESTDIR=$(CURDIR)/debian/tmp core/build.sh --no-tests install:arch
-	DESTDIR=$(CURDIR)/debian/tmp linux/ibus-keyman/build.sh install
 	DESTDIR=$(CURDIR)/debian/tmp linux/keyman-system-service/build.sh install
+	DESTDIR=$(CURDIR)/debian/tmp linux/ibus-keyman/build.sh install
 	# keyman-config
 	install -d $(CURDIR)/debian/keyman/usr/share/
 	cp -r linux/keyman-config/locale/ $(CURDIR)/debian/keyman/usr/share/
@@ -76,8 +76,8 @@ override_dh_missing:
 
 override_dh_auto_clean:
 	core/build.sh clean
-	linux/ibus-keyman/build.sh clean
 	linux/keyman-system-service/build.sh clean
+	linux/ibus-keyman/build.sh clean
 	linux/keyman-config/build.sh clean
 	rm -rf .pybuild/
 	dh_auto_clean $@
diff --git a/linux/ibus-keyman/build.sh b/linux/ibus-keyman/build.sh
index bc136546d63..c2c45deec15 100755
--- a/linux/ibus-keyman/build.sh
+++ b/linux/ibus-keyman/build.sh
@@ -20,6 +20,7 @@ builder_describe \
   "install                   install artifacts" \
   "uninstall                 uninstall artifacts" \
   "@/core:arch" \
+  "@../keyman-system-service:service" \
   "--no-integration          don't run integration tests" \
   "--report                  create coverage report" \
   "--coverage                capture test coverage"
diff --git a/linux/keyman-system-service/meson.build b/linux/keyman-system-service/meson.build
index 596ba48bcd4..66da8f98914 100644
--- a/linux/keyman-system-service/meson.build
+++ b/linux/keyman-system-service/meson.build
@@ -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')
diff --git a/linux/scripts/reconf.sh b/linux/scripts/reconf.sh
index 4e4f5c1b115..49dfe21b1d0 100755
--- a/linux/scripts/reconf.sh
+++ b/linux/scripts/reconf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
@@ -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" \