- rediffed

[packages/gnome-tour.git] / gnome-tour-x32.patch

diff --git a/gnome-tour-x32.patch b/gnome-tour-x32.patch
index 0d37cbb6be68aedea0f1c68bb18afb761555f883..4b9d0de3b690000c2558f645b81a2a1bb6bebd2b 100644 (file)
--- a/gnome-tour-x32.patch
+++ b/gnome-tour-x32.patch
@@ -1,13 +1,13 @@
---- gnome-tour-40.0/build-aux/cargo.sh.orig    2021-03-23 16:31:44.642007800 +0100
-+++ gnome-tour-40.0/build-aux/cargo.sh 2021-04-24 17:48:45.504234520 +0200
-@@ -2,19 +2,20 @@
+--- 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 @@
  
  export MESON_BUILD_ROOT="$1"
  export MESON_SOURCE_ROOT="$2"
--export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
 +export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32"
-+export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target/x86_64-unknown-linux-gnux32
- export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
+ export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
+ export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
+ 
  FEATURES="$6"
  
 -if [ $4 = "Devel" ]
@@ -17,11 +17,14 @@
 -    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"/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"/release/$5 $3
++        cp "$CARGO_TARGET_DIR"/x86_64-unknown-linux-gnux32/release/$5 $3
  fi
+