diff --git a/srcpkgs/gnome-podcasts/patches/fix-build.patch b/srcpkgs/gnome-podcasts/patches/fix-build.patch deleted file mode 100644 index aeb9581bd79..00000000000 --- a/srcpkgs/gnome-podcasts/patches/fix-build.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- podcasts-gtk/src/widgets/episode.rs.orig 2019-06-09 15:54:59.793451047 +0200 -+++ podcasts-gtk/src/widgets/episode.rs 2019-06-09 15:55:19.191311512 +0200 -@@ -559,7 +559,7 @@ - .total_size - .get_text() - .as_ref() -- .map(|s| s.trim_right_matches(" MB")) -+ .map(|s| s.trim_end_matches(" MB")) - .and_then(|s| s.parse::().ok()) - .is_none() - { ---- podcasts-gtk/src/widgets/shows_view.rs.orig 2019-06-09 15:54:00.320878867 +0200 -+++ podcasts-gtk/src/widgets/shows_view.rs 2019-06-09 15:54:13.151786563 +0200 -@@ -80,7 +80,6 @@ - } - - fn on_child_activate(child: >k::FlowBoxChild, sender: &Sender) -> Result<(), Error> { -- use gtk::WidgetExt; - - // This is such an ugly hack... - let id = WidgetExt::get_name(child) diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template index 72e2db6b109..aa8fe3d2f5b 100644 --- a/srcpkgs/gnome-podcasts/template +++ b/srcpkgs/gnome-podcasts/template @@ -1,26 +1,32 @@ # Template file for 'gnome-podcasts' pkgname=gnome-podcasts -version=0.4.6 -revision=3 +version=0.4.8 +revision=1 wrksrc="podcasts-${version}" build_style=meson -hostmakedepends="cargo gettext-devel glib-devel pkg-config" +build_helper="rust" +hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel" makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel - gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo" + gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std" short_desc="Listen to your favorite podcasts" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Podcasts" distfiles="https://gitlab.gnome.org/World/podcasts/-/archive/${version}/podcasts-${version}.tar.gz" -checksum=953c63e8184ca1f748418d8a8262d40eaa41047f81e2d2c874a3035d9d9d0e4a -nocross="rustc cant be crosscompiled as of now" -broken="gettext-rs hash does not exists, if fixed build fails in gio 0.5.0" +checksum=f29c0057dfcdd6ab1745533cc6826f07adddbe3b5b9aad2757421d1259b8303c export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" -pre_build() { - cargo update --package openssl-sys --precise 0.9.46 - cargo update --package openssl --precise 0.10.22 +# Unable to init server: Could not connect: Connection refused +do_check() { + : +} + +post_patch() { + [ -z "$CROSS_BUILD" ] && return 0 + vsed -i scripts/cargo.sh \ + -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \ + -e '/CARGO_HOME/d' }