Description: Set correct meson build paths
 Additionally, hardcode the git revision string to the upstream release commits' hash.
Author: Matthias Geiger <werdahias@debian.org>
Forwarded: not-needed
Last-Update: 2025-02-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/

--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,7 @@
 base_id    = 'de.haeckerfelix.Shortwave'
 path_id    = '/de/haeckerfelix/Shortwave'
 app_id     = base_id
-vcs_tag    = run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip()
+vcs_tag    = '9a7e520'
 profile    = get_option('profile')
 datadir    = join_paths(get_option('prefix'), get_option('datadir'))
 localedir  = join_paths(get_option('prefix'), get_option('localedir'))
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,8 @@
   ],
   value: 'default'
 )
+option(
+  'host_arch',
+  type: 'string',
+  )
+
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,7 +25,6 @@
 
 # Setup cargo
 cargo = find_program('cargo')
-cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
 cargo_options = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
 cargo_options += [ '--target-dir', meson.project_build_root() / 'target' ]
 
@@ -48,10 +47,11 @@
   install_dir: bindir,
   command: [
     'env',
-    cargo_env,
     cargo, 'build',
     cargo_options,
     '&&',
-    'cp', 'target' / rust_target / meson.project_name(), '@OUTPUT@',
+    'cp', meson.project_build_root() / 'target' / get_option('host_arch') / 'release' / meson.project_name(), '@OUTPUT@',
+   
+ 
   ]
 )