From d44310714636f845e4268089c2668c3dd3e967e7 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 5 Aug 2022 00:21:23 -0400
Subject: [PATCH] build: Drop `join_paths()` in favor of `/`

---
 data/icons/meson.build | 16 ++++++++--------
 data/meson.build       |  8 ++++----
 meson.build            |  8 ++++----
 src/meson.build        |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/icons/meson.build b/data/icons/meson.build
index 76e55f0..f966b43 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,19 +1,19 @@
-scalable_dir = join_paths('hicolor', 'scalable', 'apps')
+scalable_dir = 'hicolor' / 'scalable' / 'apps'
 
 install_data(
-  join_paths(scalable_dir, 'org.gnome.Loupe.svg'),
-  install_dir: join_paths(iv_datadir, 'icons', scalable_dir),
+  scalable_dir / 'org.gnome.Loupe.svg',
+  install_dir: iv_datadir / 'icons' / scalable_dir,
 )
 
 install_data(
-  join_paths(scalable_dir, 'org.gnome.Loupe.Devel.svg'),
-  install_dir: join_paths(iv_datadir, 'icons', scalable_dir),
+  scalable_dir / 'org.gnome.Loupe.Devel.svg',
+  install_dir: iv_datadir / 'icons' / scalable_dir,
 )
 
-symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
+symbolic_dir = 'hicolor' / 'symbolic' / 'apps'
 
 install_data(
-  join_paths(symbolic_dir, 'org.gnome.Loupe-symbolic.svg'),
-  install_dir: join_paths(iv_datadir, 'icons', symbolic_dir),
+  symbolic_dir / 'org.gnome.Loupe-symbolic.svg',
+  install_dir: iv_datadir / 'icons' / symbolic_dir,
   rename: '@0@-symbolic.svg'.format(app_id)
 )
diff --git a/data/meson.build b/data/meson.build
index edf482b..70bb9d1 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,7 +8,7 @@ desktop_file = i18n.merge_file(
   type: 'desktop',
   po_dir: '../po',
   install: true,
-  install_dir: join_paths(iv_datadir, 'applications')
+  install_dir: iv_datadir / 'applications'
 )
 
 configure_file(
@@ -16,7 +16,7 @@ configure_file(
     output: '@0@.service'.format(app_id),
     configuration: conf,
     install: true,
-    install_dir: join_paths(iv_datadir, 'dbus-1', 'services')
+    install_dir: iv_datadir / 'dbus-1' / 'services'
 )
 
 desktop_utils = find_program('desktop-file-validate', required: false)
@@ -35,7 +35,7 @@ appstream_file = i18n.merge_file(
   output: '@0@.appdata.xml'.format(app_id),
   po_dir: '../po',
   install: true,
-  install_dir: join_paths(iv_datadir, 'appdata')
+  install_dir: iv_datadir / 'appdata'
 )
 
 # appstream_util = find_program('appstream-util', required: false)
@@ -46,7 +46,7 @@ appstream_file = i18n.merge_file(
 # endif
 
 install_data('org.gnome.Loupe.gschema.xml',
-  install_dir: join_paths(iv_datadir, 'glib-2.0', 'schemas')
+  install_dir: iv_datadir / 'glib-2.0' / 'schemas'
 )
 
 compile_schemas = find_program('glib-compile-schemas', required: false)
diff --git a/meson.build b/meson.build
index 1b785b2..3680098 100644
--- a/meson.build
+++ b/meson.build
@@ -14,10 +14,10 @@ dependency('libadwaita-1')
 cargo = find_program('cargo', required: true)
 
 iv_prefix = get_option('prefix')
-iv_bindir = join_paths(iv_prefix, get_option('bindir'))
-iv_localedir = join_paths(iv_prefix, get_option('localedir'))
-iv_datadir = join_paths(iv_prefix, get_option('datadir'))
-iv_pkgdatadir = join_paths(iv_datadir, meson.project_name())
+iv_bindir = iv_prefix / get_option('bindir')
+iv_localedir = iv_prefix / get_option('localedir')
+iv_datadir = iv_prefix / get_option('datadir')
+iv_pkgdatadir = iv_datadir / meson.project_name()
 
 profile = ''
 name_suffix = ''
diff --git a/src/meson.build b/src/meson.build
index 85b6a97..ca687e8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -7,8 +7,8 @@ configure_file(
 # Copy the config.rs output to the source directory.
 run_command(
   'cp',
-  join_paths(meson.build_root(), 'src', 'config.rs'),
-  join_paths(meson.source_root(), 'src', 'config.rs'),
+  meson.build_root() / 'src' / 'config.rs',
+  meson.source_root() / 'src' / 'config.rs',
   check: true
 )