diff --git a/srcpkgs/pika-backup/patches/remove-git-describe.patch b/srcpkgs/pika-backup/patches/remove-git-describe.patch index 37c0a02892144b..d980da7bfe5735 100644 --- a/srcpkgs/pika-backup/patches/remove-git-describe.patch +++ b/srcpkgs/pika-backup/patches/remove-git-describe.patch @@ -1,17 +1,20 @@ -diff --git a/src/meson.build b/src/meson.build -index 8f5e24f..f7444c4 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -19,12 +19,6 @@ cargo_env = { +Remove git from hostmakedepends + +diff --git a/pika-backup/src/meson.build b/pika-backup/src/meson.build +index 44bc0e9b..8007580f 100644 +--- a/pika-backup/src/meson.build ++++ b/pika-backup/src/meson.build +@@ -21,13 +21,6 @@ cargo_env = { 'CARGO_HOME': meson.project_build_root() / 'cargo', 'LOCALEDIR': get_option('prefix') / get_option('localedir'), 'APPLICATION_ID_SUFFIX': get_option('app_id_suffix'), - 'GIT_DESCRIBE': run_command( -- 'git', -- '-C', meson.project_source_root(), -- 'rev-parse', '--short', 'HEAD', -- check: false -- ).stdout().strip(), +- 'git', +- '-C', meson.project_source_root(), +- 'rev-parse', +- '--short', 'HEAD', +- check: false, +- ).stdout().strip(), } cargo_build = custom_target( diff --git a/srcpkgs/pika-backup/template b/srcpkgs/pika-backup/template index 4eb4de0dd2549e..e19c8ea33ed009 100644 --- a/srcpkgs/pika-backup/template +++ b/srcpkgs/pika-backup/template @@ -1,6 +1,6 @@ # Template file for 'pika-backup' pkgname=pika-backup -version=0.7.6 +version=0.8.3 revision=1 build_style=meson build_helper=rust @@ -14,12 +14,12 @@ license="GPL-3.0-or-later" homepage="https://apps.gnome.org/en/PikaBackup/" changelog="https://gitlab.gnome.org/World/pika-backup/-/raw/main/CHANGELOG.md" distfiles="https://gitlab.gnome.org/World/pika-backup/-/archive/${version}/pika-backup-${version}.tar.gz" -checksum=eb2910ac43fb0f74ab12f9d71c80e8700c3683627149652ca1bd545dc79223ac +checksum=2b80f73b2d5414473f1741180e7db15cbada17af9c556da191f7f86ddd0c4e77 make_check_pre="xvfb-run" post_patch() { if [ "$CROSS_BUILD" ]; then - vsed -i src/meson.build \ + vsed -i pika-backup/src/meson.build \ -e "s%rust_target /%'${RUST_TARGET}' / &%" fi }