diff --git a/sys-process/mission-center/Manifest b/sys-process/mission-center/Manifest index df5b09a..03aed77 100644 --- a/sys-process/mission-center/Manifest +++ b/sys-process/mission-center/Manifest @@ -1,4 +1,3 @@ -AUX mission-center-0.3.1-cargo_home.patch 1404 BLAKE2B b4d67d1cabd3ea38f48531adf108bff3163e8983c8569f77611b51258a382baf628fde9c29694452f0e63d8da5514f85abeade8ac02c78a04e5504039065f2a3 SHA512 f19b288ed37147248aa0e3177be73aba38464faaa51ba6d0dc7ff822f1c5584be0931e8bd3dad395a3c544d4abaf9153903bf43e77d409d3d41a6d2a12facc05 AUX mission-center-0.4.3-nvtop-source-dir.patch 770 BLAKE2B c66fa3a0f5e9835d1fd8f8de8fd498d4c9f8db6b048228c855336443a8cb3d631e048a5b3da77eb5327a1047eb3971b899dd9a6803653f36e001980264a954f6 SHA512 78e72fe911b57c8eb6c5eaac921158f4f10bb43e61e83c4c8c6b7dc0eef3c4f6f83c82f44ea72d98da970a8e46300fd5a72ce2137a18be1e8d8a697371d0597c DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 @@ -275,4 +274,4 @@ DIST xattr-1.0.1.crate 12258 BLAKE2B 5f7614de3e7179983c9767953b7713fa387ffb011ce DIST xml-rs-0.8.19.crate 54051 BLAKE2B 667358226fd5fa1829110ee9b587dae7d95fe1f010f8106f515af12435d3c49b0f9f3c09bb4ec4fa019f8e9b25575b3c5fc2dd5858b37b5bbca9bfa263df842a SHA512 a46796ed542a7396e760ee327ec191e96d61b3fd8b78cef2ab2da75c5290433f422a34cabef20267e8a6a162e0a48fc8f81cd66a5dcf997ddd539e55d9130199 DIST zerocopy-0.7.25.crate 127666 BLAKE2B 6fc6c70e21ea62ddd176017ba80e72308d461b24ca622f45b87cee8f712c2dbc03e6b79bd52b8a848a43e5520963146ae04a1d31ae9bdda1d9905d194c1ad0cf SHA512 b0fbf1498ec9fe81e155bcba1e0b4a6491ad1ae407eeb87537e438676d9358631319ab9104b9d4ff02b832588bde3563b504ba7ea760ebf4d22408e518c48c6e DIST zerocopy-derive-0.7.25.crate 528380 BLAKE2B d54f73b86c076f6c79dc5e78e8fec0baeb8cb59a1ebf2606ceac07782ba6e237b5b44c1650c2cef5b2ed0903f25888a40ee8b8dbe0e160f4d0ac6142d81b3788 SHA512 1537b38d331ba9d4131fb5b402965069cc414d3981c7dcbddcf64b9a5be4c2e2965604172e31de7d9b85c9aec635277e5319e791671144843ff717973cb80daf -EBUILD mission-center-0.4.3.ebuild 8074 BLAKE2B ded62649cfb02d70eb0f0d2f2ee4525f336ab64cfa1da5134ad0c28ef5a01cbc8b702579d063d00c130a48f983b8d6fb72c7ffb935921733feb74b58af75fe59 SHA512 ceed3819cd2d0216616d8f14ffdd9ffe7e791fd0a44351c213b42e17d9fdd37d472e6308cedf9ad70c43f78ea3fc6868054f93e2134e618f4d8dc3d01d6a5b59 +EBUILD mission-center-0.4.3.ebuild 8082 BLAKE2B 75fc684b1556ad6132e6af0333cb9dd362e44d3290ce0de45f0070b7ae8935a8b0d9a86d2f8c67321046d3fe0949dfc7efe63aaaefca52148452a613bc862791 SHA512 50e3c6bf11885b4cd40607b7583678cc6d6291ca2691eac293fd3655536b3c8b5a8c63dd047ba1ea14513861f4a65684cec6665443741b51944805ad1a09b225 diff --git a/sys-process/mission-center/files/mission-center-0.3.1-cargo_home.patch b/sys-process/mission-center/files/mission-center-0.3.1-cargo_home.patch deleted file mode 100644 index 583ff84..0000000 --- a/sys-process/mission-center/files/mission-center-0.3.1-cargo_home.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -dNur a/src/meson.build b/src/meson.build ---- a/src/meson.build 2023-08-22 19:43:58.000000000 +0200 -+++ b/src/meson.build 2023-08-23 15:12:42.913477168 +0200 -@@ -27,14 +27,8 @@ - cargo_bin = find_program('cargo') - - cargo_env = get_option('cargo_env') --if get_option('flatpak') == false -- cargo_env += [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ] -- cargo_opt = [] --else -- cargo_opt = [] --endif - --cargo_opt += [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ] -+cargo_opt = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ] - cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ] - cargo_env += [ 'BUILD_ROOT=' + meson.project_build_root() ] - -diff -dNur a/src/sys_info_v2/gatherer/meson.build b/src/sys_info_v2/gatherer/meson.build ---- a/src/sys_info_v2/gatherer/meson.build 2023-08-22 19:43:58.000000000 +0200 -+++ b/src/sys_info_v2/gatherer/meson.build 2023-08-23 15:14:13.570236075 +0200 -@@ -4,7 +4,7 @@ - cargo_bin = find_program('cargo') - cargo_opt = [ '--manifest-path', meson.project_source_root() / project_path / 'Cargo.toml' ] - cargo_opt += [ '--target-dir', meson.project_build_root() / project_path / 'src' ] --cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / project_path/ 'cargo-home' ] -+cargo_env = get_option('cargo_env') - - if get_option('buildtype') == 'release' - cargo_opt += [ '--release' ] diff --git a/sys-process/mission-center/mission-center-0.4.3.ebuild b/sys-process/mission-center/mission-center-0.4.3.ebuild index bcccd13..47be1b1 100644 --- a/sys-process/mission-center/mission-center-0.4.3.ebuild +++ b/sys-process/mission-center/mission-center-0.4.3.ebuild @@ -312,8 +312,6 @@ LICENSE+=" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - DEPEND=" >=dev-libs/glib-2.78.0 dev-python/pygobject @@ -328,11 +326,9 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=">=virtual/rust-1.70 >=dev-util/blueprint-compiler-0.10.0 - sys-devel/patch " PATCHES=" - "${FILESDIR}"/${PN}-0.3.1-cargo_home.patch "${FILESDIR}"/${P}-nvtop-source-dir.patch " @@ -340,16 +336,15 @@ S="${WORKDIR}/${PN}-v${PV}" src_prepare() { for p in "${S}"/src/sys_info_v2/gatherer/3rdparty/nvtop/patches/*.patch; do - patch -p1 -d "${WORKDIR}"/nvtop-${NVTOP_SNAPSHOT} < ${p} + eapply -d "${WORKDIR}/nvtop-${NVTOP_SNAPSHOT}" -p1 -- "${p}" done default } src_configure() { - local emesonargs=( - -Dcargo_env=CARGO_HOME=${ECARGO_HOME} - ) meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die + ln -s "${CARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" || die } pkg_postinst() {