[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/leftwm/, x11-wm/leftwm/files/

[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/leftwm/, x11-wm/leftwm/files/

[Takuya Wakazono]

commit:     6d19f4de22a16de38e52408e4045e2f2eae9ef3f
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Aug 29 13:59:55 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Aug 29 14:44:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d19f4de

x11-wm/leftwm: use cargo_target_dir helper

- use cargo_target_dir helper
- fix build with rust-1.80

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 x11-wm/leftwm/Manifest                           |  5 ++-
 x11-wm/leftwm/files/leftwm-0.5.1-rust-1.80.patch | 47 ++++++++++++++++++++++++
 x11-wm/leftwm/leftwm-0.5.1.ebuild                | 16 +++++---
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/x11-wm/leftwm/Manifest b/x11-wm/leftwm/Manifest
index 9e780834c..aaf5d4dfb 100644
--- a/x11-wm/leftwm/Manifest
+++ b/x11-wm/leftwm/Manifest
@@ -77,6 +77,7 @@ DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353c
 DIST mio-0.8.9.crate 102227 BLAKE2B d21e886817c57adf6ff255c26c82f6a7eda3a036a78b75f676710307e9fe338756c87a290a9dc42dd536e4c9bec680589424d6d199db7e2bc2498b5634abd30a SHA512 a078b1db6140d77452c24647aa91ec6563d00bc3516fb44c34b79797fdc953493cf844f1ab84d226582e9d61c383f4a743fd93853d71e362fb9dfc8dc6529808
 DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
+DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
@@ -126,9 +127,9 @@ DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1c
 DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46
 DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
 DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31
-DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
+DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST tokio-1.34.0.crate 736847 BLAKE2B de011340be791897f7aff72e80e4516379b666ab143dc58bc47f900b2276eb5ba5dda855534d649bbfa2735ea0581a12432207b7ebc040f5ddf0600779492448 SHA512 8749f5eb1a96bb13ffc6a431aafa618cc116a59be96700298ca52c7b129b48a087641f60e91c051f78dec61eafd9b5f1cb4de041e0a1abaab4509ffb81d02689
 DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
 DIST toml-0.8.8.crate 50451 BLAKE2B 96d5411e8806c9021409ce232a11fd6d81269ef2f56b2a64d7217c9af8d0b31258b8c650e2bce9ca1d561a5fc58d1e556493d06199842a4d81884085622ae3c9 SHA512 6a583ce29d8179b480d29ca5e4624a4d6a8212cc741cd0c27c88ce46526f664a2f32eafd322b648f145f5ee5024d522a126f56befab5f1d68c32f2fb9866c7e5

diff --git a/x11-wm/leftwm/files/leftwm-0.5.1-rust-1.80.patch b/x11-wm/leftwm/files/leftwm-0.5.1-rust-1.80.patch
new file mode 100644
index 000000000..dd86569d5
--- /dev/null
+++ b/x11-wm/leftwm/files/leftwm-0.5.1-rust-1.80.patch
@@ -0,0 +1,47 @@
+https://github.com/leftwm/leftwm/commit/7e7fcab2c141bac303b70b33a5890ec8b0666f74
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -777,6 +777,12 @@ dependencies = [
+  "winapi",
+ ]
+ 
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num-traits"
+ version = "0.2.17"
+@@ -1218,13 +1224,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.30"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+  "libc",
++ "num-conv",
+  "num_threads",
+  "powerfmt",
+  "serde",
+@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.15"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+ 

diff --git a/x11-wm/leftwm/leftwm-0.5.1.ebuild b/x11-wm/leftwm/leftwm-0.5.1.ebuild
index 9922f6597..0edb1ee74 100644
--- a/x11-wm/leftwm/leftwm-0.5.1.ebuild
+++ b/x11-wm/leftwm/leftwm-0.5.1.ebuild
@@ -82,6 +82,7 @@ CRATES="
 	mio@0.8.9
 	nix@0.27.1
 	nu-ansi-term@0.46.0
+	num-conv@0.1.0
 	num-traits@0.2.17
 	num_cpus@1.16.0
 	num_threads@0.1.6
@@ -132,8 +133,8 @@ CRATES="
 	thiserror@1.0.50
 	thread_local@1.1.7
 	time-core@0.1.2
-	time-macros@0.2.15
-	time@0.3.30
+	time-macros@0.2.18
+	time@0.3.36
 	tokio-macros@2.2.0
 	tokio@1.34.0
 	toml@0.8.8
@@ -198,7 +199,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-nolefthk.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-nolefthk.patch"
+	# fix build with rust-1.80
+	"${FILESDIR}/${P}-rust-1.80.patch"
+)
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
@@ -218,7 +223,6 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins leftwm.desktop
 
-	bins="target/$(usex debug debug release)"
-	dobin "${bins}"/leftwm{,-worker,-state,-check,-command}
-	use lefthk && dobin "${bins}"/lefthk-worker
+	dobin "$(cargo_target_dir)"/leftwm{,-worker,-state,-check,-command}
+	use lefthk && dobin "$(cargo_target_dir)"/leftwm-worker
 }