From 81f6c65fb08cbf72012e959df1cebb1ad2119bbc Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Jan 2023 21:26:53 -0500 Subject: [PATCH] fragments: update to 2.1 --- srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------ srcpkgs/fragments/template | 11 +++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch index 2fdc1521e03d..ecabe0e7804b 100644 --- a/srcpkgs/fragments/patches/no-git.patch +++ b/srcpkgs/fragments/patches/no-git.patch @@ -1,11 +1,13 @@ +diff --git a/meson.build b/meson.build +index 0cb46023cc..eec7e4f694 100644 --- a/meson.build +++ b/meson.build -@@ -17,7 +17,7 @@ - name = 'Fragments' - app_id = 'de.haeckerfelix.Fragments' - profile = get_option('profile') +@@ -20,7 +20,7 @@ name = 'Fragments' + base_id = 'de.haeckerfelix.Fragments' + path_id = '/de/haeckerfelix/Fragments' + app_id = base_id -vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() +vcs_tag = 'none' + profile = get_option('profile') + datadir = join_paths(get_option('prefix'), get_option('datadir')) localedir = join_paths(get_option('prefix'), get_option('localedir')) - datadir = get_option('datadir') - pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name()) diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template index ec3a4f9bd315..f0999c7d6fc3 100644 --- a/srcpkgs/fragments/template +++ b/srcpkgs/fragments/template @@ -1,10 +1,10 @@ # Template file for 'fragments' pkgname=fragments -version=2.0.2 +version=2.1 revision=1 build_style=meson build_helper="rust" -hostmakedepends="cargo pkg-config gettext glib-devel" +hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel" makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel openssl-devel rust-std" short_desc="BitTorrent Client" @@ -12,12 +12,11 @@ maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/Fragments" distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz" -checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf +checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564 post_patch() { if [ "$CROSS_BUILD" ]; then - vsed -i build-aux/cargo.sh \ - -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \ - -e '/CARGO_HOME/d' + vsed -i src/meson.build \ + -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%" fi }