From 9efe99c18df000b726394212efa9ea9af7d039f8 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <mathieu@daitauha.fr>
Date: Tue, 20 Aug 2024 10:36:14 +0200
Subject: [PATCH 1/2] Use the preferred / operator instead of the join_paths
 function

---
 data/meson.build    | 14 +++++++-------
 scripts/meson.build |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 21a6189..255eded 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -43,14 +43,14 @@ i18n.merge_file(input: configure_file(
 
 # Install the desktop files
 conf_data = configuration_data()
-conf_data.set('bindir', join_paths(prefix, get_option('bindir')))
+conf_data.set('bindir', prefix / get_option('bindir'))
 i18n.merge_file(input: configure_file(
     input: 'org.freedesktop.cangjie.ibus.cangjie-setup.desktop.in.in',
     output: 'org.freedesktop.cangjie.ibus.cangjie-setup.desktop.in',
     configuration: conf_data),
   output: 'org.freedesktop.cangjie.ibus.cangjie-setup.desktop',
   install: true,
-  install_dir: join_paths(datadir, 'applications'),
+  install_dir: datadir / 'applications',
   po_dir: po_dir,
   type: 'desktop')
 i18n.merge_file(input: configure_file(
@@ -59,7 +59,7 @@ i18n.merge_file(input: configure_file(
     configuration: conf_data),
   output: 'org.freedesktop.cangjie.ibus.quick-setup.desktop',
   install: true,
-  install_dir: join_paths(datadir, 'applications'),
+  install_dir: datadir / 'applications',
   po_dir: po_dir,
   type: 'desktop')
 # Compatibility with pre-meson version for Gnome Settings
@@ -72,20 +72,20 @@ install_symlink('ibus-setup-quick.desktop',
 
 # Install the IBus components
 conf_data = configuration_data()
-conf_data.set('BINDIR', join_paths(prefix, get_option('bindir')))
-conf_data.set('ICON16DIR', join_paths(datadir, 'icons/hicolor/16x16/intl'))
+conf_data.set('BINDIR', prefix / get_option('bindir'))
+conf_data.set('ICON16DIR', datadir / 'icons/hicolor/16x16/intl')
 conf_data.set('PKGLIBEXECDIR', pkglibexecdir)
 conf_data.set('VERSION', meson.project_version())
 configure_file(
   input: 'org.freedesktop.cangjie.ibus.Cangjie.xml.in',
   output: 'org.freedesktop.cangjie.ibus.Cangjie.xml',
   configuration: conf_data,
-  install_dir: join_paths(datadir, 'ibus/component'))
+  install_dir: datadir / 'ibus/component')
 configure_file(
   input: 'org.freedesktop.cangjie.ibus.Quick.xml.in',
   output: 'org.freedesktop.cangjie.ibus.Quick.xml',
   configuration: conf_data,
-  install_dir: join_paths(datadir, 'ibus/component'))
+  install_dir: datadir / 'ibus/component')
 
 # Compile the GSettings XML files
 install_data('org.freedesktop.cangjie.ibus.Cangjie.gschema.xml',
diff --git a/scripts/meson.build b/scripts/meson.build
index 75013b9..7802a56 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -2,8 +2,8 @@ conf_data = configuration_data()
 conf_data.set('COMPONENTDIR', componentdir)
 conf_data.set('CANGJIE_GETTEXT_PACKAGE', meson.project_name())
 conf_data.set('LOCALEDIR', localedir)
-conf_data.set('BINDIR', join_paths(prefix, get_option('bindir')))
-conf_data.set('ICON16DIR', join_paths(datadir, 'icons/hicolor/16x16/intl'))
+conf_data.set('BINDIR', prefix / get_option('bindir'))
+conf_data.set('ICON16DIR', datadir / 'icons/hicolor/16x16/intl')
 conf_data.set('PKGLIBEXECDIR', libexecdir)
 conf_data.set('PKGDATADIR', datadir / meson.project_name())
 conf_data.set('PYTHON_PATH', py.full_path())
-- 
GitLab


From b8adeb87dfb64238c31fe231e366885a8892e710 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <mathieu@daitauha.fr>
Date: Tue, 20 Aug 2024 10:38:36 +0200
Subject: [PATCH 2/2] Bump the CI tags

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33aadb5..885c05d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,8 +68,8 @@ variables:
     python3-pycangjie
   FDO_UPSTREAM_REPO: cangjie/ibus-cangjie
 
-  FEDORA_TAG: "2024-08-19.0"
-  UBUNTU_TAG: "2024-08-19.0"
+  FEDORA_TAG: "2024-08-20.0"
+  UBUNTU_TAG: "2024-08-20.0"
 
   MESON_BUILDDIR: "builddir"
   NINJA_ARGS: ""
-- 
GitLab