1
0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 13:52:40 +01:00

Compare commits

...

2 Commits

4 changed files with 14 additions and 65 deletions

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,6 @@ AUX mission-center-0.3.1-cargo_home.patch 1404 BLAKE2B b4d67d1cabd3ea38f48531adf
AUX mission-center-0.3.1-intel-gpu-support.patch 389 BLAKE2B 0a76f0dabdfaccec953d9108b4254088a60840f194e495d19b491bd5c8c0303a0eaa0622c8916907938aa369a020ba2a1cc817851c09c6a8afa8c6964f517307 SHA512 aecfec1add9ef5cd5d4776e0c7fb4343ea1a203e96d9eeec0d70fed0a86977fa9b53980e41efa44b231adc0b72a5f69c72ec2e7a2209eeea551fcb3b4a2c774d AUX mission-center-0.3.1-intel-gpu-support.patch 389 BLAKE2B 0a76f0dabdfaccec953d9108b4254088a60840f194e495d19b491bd5c8c0303a0eaa0622c8916907938aa369a020ba2a1cc817851c09c6a8afa8c6964f517307 SHA512 aecfec1add9ef5cd5d4776e0c7fb4343ea1a203e96d9eeec0d70fed0a86977fa9b53980e41efa44b231adc0b72a5f69c72ec2e7a2209eeea551fcb3b4a2c774d
AUX mission-center-0.3.1-metainfo.patch 488 BLAKE2B e1b2efb443575c739071265acef9b901c35337d8d8860b95eec3b3fb6d069eec9069898fc491168ad69e91a23ae2a2bb0fe530be1ec7971bff379a47ec7fc903 SHA512 8c40f7e984e8ac3684b74680bdf6f65709666ee210bb1f916806a87f766293a01d3fd163bfce15d98e66155abbe3de0e3d34861125c727058b70aa38787a189d AUX mission-center-0.3.1-metainfo.patch 488 BLAKE2B e1b2efb443575c739071265acef9b901c35337d8d8860b95eec3b3fb6d069eec9069898fc491168ad69e91a23ae2a2bb0fe530be1ec7971bff379a47ec7fc903 SHA512 8c40f7e984e8ac3684b74680bdf6f65709666ee210bb1f916806a87f766293a01d3fd163bfce15d98e66155abbe3de0e3d34861125c727058b70aa38787a189d
AUX mission-center-0.3.1-no-browsers-in-applications.patch 1881 BLAKE2B be9a2979236d870580d5f43f30feddc370005a486a7b9ad50d11af18f1a9af48055f0b994aa19f60a4c516e4cba2c3b0dacd56838e427a323e1b8acf631dc8ea SHA512 8253071c51029612f8e29376f5d8f5ef69dc39f2120511e092434b3e3f6186c9970ffcf5cdeb499cd37fc33cb5f26a09e56b2ec08305309b27d0622a78f45c38 AUX mission-center-0.3.1-no-browsers-in-applications.patch 1881 BLAKE2B be9a2979236d870580d5f43f30feddc370005a486a7b9ad50d11af18f1a9af48055f0b994aa19f60a4c516e4cba2c3b0dacd56838e427a323e1b8acf631dc8ea SHA512 8253071c51029612f8e29376f5d8f5ef69dc39f2120511e092434b3e3f6186c9970ffcf5cdeb499cd37fc33cb5f26a09e56b2ec08305309b27d0622a78f45c38
AUX mission-center-0.3.1-nvtop-3.0.2.patch 2380 BLAKE2B 73d9001b6e3652ee22425333e008993044134a3848f8e683b8e60a28438aa7066215c7d4119d94c79cac3ce53cd414646a0b1d031195bdb4607a588dcf1a7cbc SHA512 91625e7d255e671b9f52b75223064e4d24ab70a080efcf4447e8ffacbd1e9c0682ace9a751af9819f6d7f16099f5f1cc5fbc0c5d554ebea4afc300174afc5382
DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25 DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
@@ -143,7 +142,7 @@ DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395
DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
DIST nvtop-3.0.2.tar.gz 241421 BLAKE2B 6d0c1101bfd9401ab8174721840c9b70f34b334e3d8f3d4e79f0df9a726118a43911adf6bc8c839e5259d780783abe7daa6622d31057cb2906e2c56d655f4c03 SHA512 e5f23796c37b21f9e16f90b6aecce010239f736e60698fec22f663afef24439680132cb4bf08c56b9c05a9a69fa81421fed46c392adc06435f5209552337caed DIST nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324.tar.gz 241912 BLAKE2B b12ecaf361b16d90564f6079984a3abdb89859a93441a482dd2bebbb3ece75df61ec1646ed64127e1ebadf0b76663157ea711acefdaea068f31d968f15fc8071 SHA512 847799f805429c12d00c00635714c561f095e71a06cfd853ca6ef63468d1c676f970a1365a7e00f9bc969b088ed9f3451d235dc9e79f5fc9c1efaf16f3b99bfc
DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
@@ -257,4 +256,4 @@ DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db298
DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
DIST winnow-0.4.9.crate 143537 BLAKE2B c5c52420dc6e6e8fc49f7fc778f8276d5fc3a024c2a39da5fc60142d6c0d2fb2da34e53e1e7ba8648733abb3eca69b3fb251adfd53f8f27735a16d23960718be SHA512 1e30230541b995fd4902392c8000870d289df0d3040e3b6b5fa098d1194f315263a3ab64ee0858977cda543146ff402a758cad78a43ba02286dbf14bdc3abc37 DIST winnow-0.4.9.crate 143537 BLAKE2B c5c52420dc6e6e8fc49f7fc778f8276d5fc3a024c2a39da5fc60142d6c0d2fb2da34e53e1e7ba8648733abb3eca69b3fb251adfd53f8f27735a16d23960718be SHA512 1e30230541b995fd4902392c8000870d289df0d3040e3b6b5fa098d1194f315263a3ab64ee0858977cda543146ff402a758cad78a43ba02286dbf14bdc3abc37
DIST xml-rs-0.8.15.crate 52939 BLAKE2B 56e4cc50d8d5e3620bca0285b1ba910dd8a7d458b06d561f5368ca8f067abbb7ab62724583cc0f18db0e6b0e1822af45c39b58ae510b5ece735be463ba773ebd SHA512 43fa0a0e9b29be92b508b065c0d1fd8f7b80b53011523af031ecc6a57f7bbbc108cea0da4088128b0ca9a24e9b6f83497480876ed00daa7d0e785251ecd673aa DIST xml-rs-0.8.15.crate 52939 BLAKE2B 56e4cc50d8d5e3620bca0285b1ba910dd8a7d458b06d561f5368ca8f067abbb7ab62724583cc0f18db0e6b0e1822af45c39b58ae510b5ece735be463ba773ebd SHA512 43fa0a0e9b29be92b508b065c0d1fd8f7b80b53011523af031ecc6a57f7bbbc108cea0da4088128b0ca9a24e9b6f83497480876ed00daa7d0e785251ecd673aa
EBUILD mission-center-0.3.1-r1.ebuild 9000 BLAKE2B 401351c4cc6a35782040bb38a01b70cbdeeeda9af99691aed46a29ae52a253575574ecce75adda254b289bc5ac839ec0a9c222b35a75e592de3cfd6b98d256ef SHA512 d542dc2daec60074e0662ed14d4467895aaea6a3564e42148b64ca38376e91c49cad25ecfea5d82c0502e91c6b7d35f56013f4b98d055df0758bed1fb3ab4660 EBUILD mission-center-0.3.1-r1.ebuild 9217 BLAKE2B bdae29e8d6f504abd512cc00c756bfb183b5c877a3bd7a58d0c598e28b7773c0b4562c96e4b5e1786a92fd460a55cdcfbda5472f4f3c81790bf30f07652c6b1c SHA512 89de98eabc457223b4337a197e63efa95e20927dabde72075c2a7855a902f1d2e0a111bf026b32a59e31ff474effc62a651d9896865e44c65598d05cef59cabe

View File

@@ -1,54 +0,0 @@
diff --git a/flatpak/io.missioncenter.MissionCenter.json b/flatpak/io.missioncenter.MissionCenter.json
index 42bf278..226d537 100644
--- a/flatpak/io.missioncenter.MissionCenter.json
+++ b/flatpak/io.missioncenter.MissionCenter.json
@@ -233,9 +233,9 @@
},
{
"type": "archive",
- "url": "https://github.com/Syllo/nvtop/archive/be47f8c560487efc6e6a419d59c69bfbdb819324.tar.gz",
- "sha256": "47c963deb1d22c75e92ca2cc7fcd1e1552cfa6da70e9d51be6a80da45249035f",
- "dest": "subprojects/nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324"
+ "url": "https://github.com/Syllo/nvtop/archive/refs/tags/3.0.2.tar.gz",
+ "sha256": "63fa45a2d675fe5320704850c216da6a6bb2edaf09821c26b3800fa7744bae00",
+ "dest": "subprojects/nvtop-3.0.2"
},
{
"type": "shell",
diff --git a/subprojects/nvtop.wrap b/subprojects/nvtop.wrap
index c367211..7d383ff 100644
--- a/subprojects/nvtop.wrap
+++ b/subprojects/nvtop.wrap
@@ -1,9 +1,9 @@
[wrap-file]
-directory = nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324
+directory = nvtop-3.0.2
-source_url = https://github.com/Syllo/nvtop/archive/be47f8c560487efc6e6a419d59c69bfbdb819324.tar.gz
-source_filename = be47f8c560487efc6e6a419d59c69bfbdb819324.tar.gz
-source_hash = 47c963deb1d22c75e92ca2cc7fcd1e1552cfa6da70e9d51be6a80da45249035f
+source_url = https://github.com/Syllo/nvtop/archive/refs/tags/3.0.2.tar.gz
+source_filename = nvtop-3.0.2.tar.gz
+source_hash = 63fa45a2d675fe5320704850c216da6a6bb2edaf09821c26b3800fa7744bae00
diff_files = nvtop-meson.patch, nvtop-amdgpu-h.patch, nvtop-amdgpu_drm-h.patch, nvtop-constructors.patch, nvtop-no-assert-amdgpu.patch
diff --git a/subprojects/packagefiles/nvtop-meson.patch b/subprojects/packagefiles/nvtop-meson.patch
index 99106bf..cba318c 100644
--- a/subprojects/packagefiles/nvtop-meson.patch
+++ b/subprojects/packagefiles/nvtop-meson.patch
@@ -4,12 +4,12 @@ index 0000000..73baf63
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,54 @@
-+project('libnvtop', 'c', version: '3.0.1')
++project('libnvtop', 'c', version: '3.0.2')
+
+conf = configuration_data()
+conf.set('nvtop_VERSION_MAJOR', '3')
+conf.set('nvtop_VERSION_MINOR', '0')
-+conf.set('nvtop_VERSION_PATCH', '1')
++conf.set('nvtop_VERSION_PATCH', '2')
+
+version_header = configure_file(
+ input: 'include/nvtop/version.h.in',

View File

@@ -247,7 +247,7 @@ CRATES="
winnow@0.4.9 winnow@0.4.9
xml-rs@0.8.15 xml-rs@0.8.15
" "
# missioncenter-gatherer
CRATES+=" CRATES+="
anyhow@1.0.72 anyhow@1.0.72
arrayvec@0.7.4 arrayvec@0.7.4
@@ -336,12 +336,12 @@ declare -A GIT_CRATES=(
inherit cargo gnome2-utils meson xdg inherit cargo gnome2-utils meson xdg
NVTOP_PV="3.0.2" NVTOP_SNAPSHOT="be47f8c560487efc6e6a419d59c69bfbdb819324"
DESCRIPTION="Monitor your CPU, Memory, Disk, Network and GPU usage" DESCRIPTION="Monitor your CPU, Memory, Disk, Network and GPU usage"
HOMEPAGE="https://missioncenter.io https://gitlab.com/mission-center-devs/mission-center" HOMEPAGE="https://missioncenter.io https://gitlab.com/mission-center-devs/mission-center"
SRC_URI="https://gitlab.com/${PN}-devs/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 SRC_URI="https://gitlab.com/${PN}-devs/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
https://github.com/Syllo/nvtop/archive/refs/tags/${NVTOP_PV}.tar.gz -> nvtop-${NVTOP_PV}.tar.gz https://github.com/Syllo/nvtop/archive/${NVTOP_SNAPSHOT}.tar.gz -> nvtop-${NVTOP_SNAPSHOT}.tar.gz
${CARGO_CRATE_URIS} ${CARGO_CRATE_URIS}
" "
@@ -374,15 +374,14 @@ PATCHES="
"${FILESDIR}"/${P}-cargo_home.patch "${FILESDIR}"/${P}-cargo_home.patch
"${FILESDIR}"/${P}-metainfo.patch "${FILESDIR}"/${P}-metainfo.patch
"${FILESDIR}"/${P}-no-browsers-in-applications.patch "${FILESDIR}"/${P}-no-browsers-in-applications.patch
"${FILESDIR}"/${P}-nvtop-3.0.2.patch
" "
S="${WORKDIR}/${PN}-v${PV}" S="${WORKDIR}/${PN}-v${PV}"
src_prepare() { src_prepare() {
ln -s "${WORKDIR}/nvtop-${NVTOP_PV}" "${S}/subprojects/nvtop-${NVTOP_PV}" ln -s "${WORKDIR}/nvtop-${NVTOP_SNAPSHOT}" "${S}/subprojects/nvtop-${NVTOP_SNAPSHOT}"
for p in "${S}"/subprojects/packagefiles/nvtop-*.patch; do for p in "${S}"/subprojects/packagefiles/nvtop-*.patch; do
patch -p1 -d "${WORKDIR}/nvtop-${NVTOP_PV}" < ${p} patch -p1 -d "${WORKDIR}/nvtop-${NVTOP_SNAPSHOT}" < ${p}
done done
if use video_cards_intel; then if use video_cards_intel; then
@@ -402,6 +401,11 @@ src_configure() {
pkg_postinst() { pkg_postinst() {
gnome2_schemas_update gnome2_schemas_update
xdg_pkg_postinst xdg_pkg_postinst
if use video_cards_intel; then
ewarn "Intel GPU monitoring isn't yet supported by upstream Mission Center"
ewarn "Please enable this for testing purpose only."
fi
} }
pkg_postrm() { pkg_postrm() {