mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-19 07:49:00 -04:00
app-backup/pika-backup: fix build with dev-lang/python[-native-symlinks]
Closes: https://bugs.gentoo.org/903526 Signed-off-by: Julien Roy <julien@jroy.ca>
This commit is contained in:
parent
a21a996fb5
commit
f7620146fd
@ -1,8 +1,18 @@
|
||||
diff --git a/build-aux/meson-cargo-manifest.py b/build-aux/meson-cargo-manifest.py
|
||||
index 34028e2..3bf3376 100755
|
||||
--- a/build-aux/meson-cargo-manifest.py
|
||||
+++ b/build-aux/meson-cargo-manifest.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python3
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
try:
|
||||
import tomllib
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 2f20ee8..95bd28e 100644
|
||||
index 932bdb2..8938862 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -29,4 +29,3 @@ meson.add_dist_script('build-aux/meson-dist-vendor.sh')
|
||||
@@ -28,4 +28,3 @@ meson.add_dist_script('build-aux/meson-dist-vendor.sh')
|
||||
subdir('data')
|
||||
subdir('help')
|
||||
subdir('po')
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2023 Gentoo Authors
|
||||
# Copyright 2023-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -298,8 +298,8 @@ CRATES="
|
||||
zvariant_utils@1.0.0
|
||||
zxcvbn@2.2.2
|
||||
"
|
||||
|
||||
inherit cargo gnome2-utils meson xdg
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
inherit cargo gnome2-utils meson python-any-r1 xdg
|
||||
|
||||
DESCRIPTION="Keep your data safe"
|
||||
HOMEPAGE="https://gitlab.gnome.org/World/pika-backup"
|
||||
@ -322,6 +322,7 @@ DEPEND="
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
dev-util/itstool
|
||||
sys-devel/gettext
|
||||
"
|
||||
@ -332,6 +333,12 @@ PATCHES=(
|
||||
"${FILESDIR}/meson-fixes.patch"
|
||||
)
|
||||
|
||||
# src_prepare() {
|
||||
# default
|
||||
# python-any-r1_pkg_setup
|
||||
# sed -e 's/python3/${EPYTHON}/' "${S}/build-aux/meson-cargo-manifest.py" || die
|
||||
# }
|
||||
|
||||
src_compile() {
|
||||
meson_src_compile
|
||||
cargo_src_compile
|
||||
|
Loading…
x
Reference in New Issue
Block a user