- updated x32 patch

diff --git a/gnome-tour-x32.patch b/gnome-tour-x32.patch
index 4b9d0de3b690000c2558f645b81a2a1bb6bebd2b..dba7c767a054b652453b932c36467354e8914086 100644 (file)
--- a/gnome-tour-x32.patch
+++ b/gnome-tour-x32.patch
@@ -1,30 +1,19 @@
---- gnome-tour-40.1/build-aux/cargo.sh.orig    2022-02-25 21:00:28.623808095 +0100
-+++ gnome-tour-40.1/build-aux/cargo.sh 2022-02-25 21:02:12.635883673 +0100
-@@ -2,21 +2,22 @@
+--- gnome-tour-42.0/src/meson.build.orig       2022-03-19 18:09:13.817518700 +0100
++++ gnome-tour-42.0/src/meson.build    2022-05-20 21:03:40.346043909 +0200
+@@ -20,6 +20,7 @@ run_command(
  
- export MESON_BUILD_ROOT="$1"
- export MESON_SOURCE_ROOT="$2"
-+export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32"
- export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
- export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
  
- FEATURES="$6"
+ cargo_options = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
++cargo_options += [ '--target', 'x86_64-unknown-linux-gnux32' ]
+ cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]
  
--if [ $4 = "Devel" ]
-+if [ "$4" = "Devel" ]
- then
-     echo "DEBUG MODE"
--    cargo build --manifest-path \
-+    cargo build $CARGO_TARGET_OPT --manifest-path \
-         "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES && \
--        cp "$CARGO_TARGET_DIR"/debug/$5 $3
-+        cp "$CARGO_TARGET_DIR"/x86_64-unknown-linux-gnux32/debug/$5 $3
- else
-     echo "RELEASE MODE"
--    cargo build --manifest-path \
-+    cargo build $CARGO_TARGET_OPT --manifest-path \
-         "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES --release && \
--        cp "$CARGO_TARGET_DIR"/release/$5 $3
-+        cp "$CARGO_TARGET_DIR"/x86_64-unknown-linux-gnux32/release/$5 $3
- fi
+ if get_option('profile') == 'default'
+@@ -48,7 +49,7 @@ cargo_build = custom_target(
+     cargo, 'build',
+     cargo_options,
+     '&&',
+-    'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
++    'cp', 'src' / 'x86_64-unknown-linux-gnux32' / rust_target / meson.project_name(), '@OUTPUT@',
+   ]
+ )