[packages/gnome-tour] - try with x32 patch
qboosh
qboosh at pld-linux.org
Sat Apr 24 17:52:18 CEST 2021
commit 85e1073ffecb8071d3f1a820300055f92d87895b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 24 17:54:09 2021 +0200
- try with x32 patch
gnome-tour-x32.patch | 26 ++++++++++++++++++++++++++
gnome-tour.spec | 4 ++++
2 files changed, 30 insertions(+)
---
diff --git a/gnome-tour.spec b/gnome-tour.spec
index c85507a..b5dce28 100644
--- a/gnome-tour.spec
+++ b/gnome-tour.spec
@@ -7,6 +7,7 @@ License: GPL v3+
Group: X11/Applications
Source0: https://download.gnome.org/sources/gnome-tour/40/%{name}-%{version}.tar.xz
# Source0-md5: d5ca4c8a9b248017c4e75fa4722caad0
+Patch0: %{name}-x32.patch
URL: https://gitlab.gnome.org/GNOME/gnome-tour
BuildRequires: appstream-glib
BuildRequires: cargo
@@ -48,6 +49,9 @@ Przewodnik i powitanie dla środowiska GNOME.
%prep
%setup -q
+%ifarch x32
+%patch0 -p1
+%endif
%build
%meson build
diff --git a/gnome-tour-x32.patch b/gnome-tour-x32.patch
new file mode 100644
index 0000000..71a6f78
--- /dev/null
+++ b/gnome-tour-x32.patch
@@ -0,0 +1,26 @@
+--- ../BUILD/gnome-tour-40.0/build-aux/cargo.sh.orig 2021-03-23 16:31:44.642007800 +0100
++++ ../BUILD/gnome-tour-40.0/build-aux/cargo.sh 2021-04-24 17:48:45.504234520 +0200
+@@ -2,19 +2,20 @@
+
+ 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
+ FEATURES="$6"
+
+ 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
+ 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
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-tour.git/commitdiff/85e1073ffecb8071d3f1a820300055f92d87895b
More information about the pld-cvs-commit
mailing list