fractal: update to 4.2.2 and fix build

This commit is contained in:
q66 2019-12-18 04:36:41 +01:00 committed by Daniel Kolesa
parent 0a3e073167
commit 141148e781
2 changed files with 43 additions and 15 deletions

View file

@ -0,0 +1,28 @@
Our LibreSSL requires newer openssl-sys.
Also, older num-bigint appears to be broken on ARM.
Some builds also fail with unused import.
--- fractal-gtk/src/app/backend_loop.rs
+++ fractal-gtk/src/app/backend_loop.rs
@@ -12,8 +12,6 @@ use std::thread;
use crate::backend::BKResponse;
use fractal_api::error::Error;
-use std::sync::mpsc::RecvError;
-
pub fn backend_loop(rx: Receiver<BKResponse>) {
thread::spawn(move || {
while let Ok(recv) = rx.recv() {
--- scripts/cargo.sh
+++ scripts/cargo.sh
@@ -5,6 +5,9 @@ export CARGO_TARGET_DIR="$3"/target
export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
export FRACTAL_PROFILE="$4"
+cargo update --manifest-path $1/Cargo.toml -p fractal-gtk --package openssl-sys --precise 0.9.53
+cargo update --manifest-path $1/Cargo.toml -p fractal-gtk --package num-bigint --precise 0.2.3
+
if [ "$FRACTAL_PROFILE" = "Devel" ]
then
echo "DEBUG MODE"

View file

@ -1,29 +1,29 @@
# Template file for 'fractal'
pkgname=fractal
version=4.0.0
revision=2
version=4.2.2
revision=1
build_style=meson
build_helper="rust"
hostmakedepends="cargo pkg-config glib-devel"
makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
gtksourceview-devel pango-devel gspell-devel gmp-devel libsecret-devel
libhandy-devel rust-std"
gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
gmp-devel libsecret-devel libhandy-devel rust-std"
short_desc="Matrix Messaging Client for GNOME"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
distfiles="https://gitlab.gnome.org/World/fractal/-/archive/$version/$pkgname-$version.tar.gz"
checksum=f55b01dba5512abedd907d65bf1cd3a96243d81004152cd681ce7e306f777c2f
checksum=3f722e2fbadd6cee1ce98a92cf718c8051532dfd71180a453695365aa80d2b02
case "$XBPS_TARGET_MACHINE" in
armv6l-musl) broken="error: Could not compile gtk." ;;
esac
if [ "$CROSS_BUILD" ]; then
pre_build() {
vsed -i scripts/cargo.sh \
-e 's/target\//&${RUST_TARGET}\//' \
-e '/CARGO_HOME/d'
}
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
broken="error: Could not compile gtk. (segfaults rustc)"
fi
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
vsed -i scripts/cargo.sh \
-e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
-e '/CARGO_HOME/d'
}