commit: 56f190bdadeafb4423b9db80d13ad2c001a429e9 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Fri Nov 29 11:45:59 2024 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Fri Nov 29 11:45:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56f190bd
media-sound/spotifyd: fix build with rust-1.80 Closes: https://bugs.gentoo.org/945307 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> media-sound/spotifyd/Manifest | 10 +- .../files/spotifyd-0.3.5_p20240513-rust-1.80.patch | 113 +++++++++++++++++++++ .../spotifyd/spotifyd-0.3.5_p20240513.ebuild | 15 ++- 3 files changed, 130 insertions(+), 8 deletions(-) diff --git a/media-sound/spotifyd/Manifest b/media-sound/spotifyd/Manifest index 39857ac6e..56359a5a0 100644 --- a/media-sound/spotifyd/Manifest +++ b/media-sound/spotifyd/Manifest @@ -71,7 +71,7 @@ DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555e DIST dbus-0.9.7.crate 104206 BLAKE2B f08f72170fbf9af3e525c20f4f11de64368e4a5d010571bc2ed9985c13353d99466f7e98a39ac949787ee9f4d10845d6940d9dbeaf1fae2122d49eeefa5306b1 SHA512 c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5 DIST dbus-crossroads-0.5.2.crate 44664 BLAKE2B 3f3e330dc7c93acc0566c20b44dcda01c36cc507cc7907fb1f730448e1648546fc3ce31fcc59283bf6b8b375cdcb49ae0f248df02e01f7430c590e8eca9c54f7 SHA512 987b80358831ff77392b622a5a86577e3e156bb793810185c432eb345ab99f98ef97ba8e483b9a1443307f3fba12d8d20ed8b570f55c6f1a5cbb511febb1cfd6 DIST dbus-tokio-0.7.6.crate 17545 BLAKE2B 67b874844d2120824101845d0022b4f75c1318658db52a1491bfccb462f476be7022bf3eb2c3fec1639eedb3ac0caf3c0468f034ab981d4c87f56cecc88f8709 SHA512 4c88cd8e88bcb86c519009150c2256a3b5cb129f75b762104536943201d387cde154ae26b75193f8156dcf85b745973a929c5b87ff70835e983995bb586cfec6 -DIST deranged-0.3.8.crate 15314 BLAKE2B 5452dd7309e64f52f06f0b4159a87678c95f5453516d9e29956806a8bce3e8aac717a094ba3f2b418336b6bcc611901d2b4c08abd7d838915e88c37d75896f9b SHA512 81577e7371b6850da0abec985f1268735169a4e9272a6bef2e1e46753457260b54ad76fedaa36280102daa0030f70dabd16d2b99fe9c67b2690e469df3c3154e +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45 @@ -193,6 +193,7 @@ DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0 DIST num-0.4.1.crate 9522 BLAKE2B a7235566f657ea9dd3c15d4cf5ce85ac94f9f0e15ef5f4dd4f6bc7f8f09b9f654635a61785dfafef56dea980ee1f7441ea6fa366e51b9db707992a6b9d036bf9 SHA512 ea3b49c1b7a361266ee44213cd65765e58bfc51b9e805bdc71bed120a3b43f87ca60ba81b231a2c9a0ced617e10024d4e0961d8a3a52f26dbce1a22d550b7a84 DIST num-bigint-0.4.4.crate 99369 BLAKE2B 09a44754e3a3d4f949b3714d96ddd7f3915164d611036675e3df421d6c0863e368eb0180978a4ec27fbfff529b4999d2593e411903516670c24c08fbed6a79de SHA512 0dcef3344a933509fdfe87d6adb0bb1bf67af3c692ccaeec5663a8f18ad0a251199ef9c7a24c25b95d1b255b413947e70f0a205669d549b13e54b6f4864ab3b5 DIST num-complex-0.4.4.crate 29564 BLAKE2B 8ae65e8f2d87de96ec0a3d0e6d580584aff8cfbd0ebe56272dcf7cc5eea1b545fb9d597cbe4b1e25562b99a217a03ceef60e6cbda47c1e8cbd29b38d16cbe428 SHA512 632f9486df426d9254d2b6484c560b31e4ac0270de85878b9c4d14339a05ab318a90019f0724d2fac4d8496b03680650f899cedb1741c58eb7536cf3732db600 +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1a67c77982d3518d9383331f34c1222dd7d72802cec22baa108ae08a87805a11942132c565ab8439c4983e99871 SHA512 e0f4d06fff26c2d2b140ff5ec1ba655a46c8d8fda484f03a8ad4910e8cf1392f0130d5c0bfbbe3bfb95da1f93e964f73364de6551fddd81e6fc27bfa35c15053 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395b29c3e620b74cf4a843cfedfa71dc690e787b291a2b08750cd8386f1dad768e1b506ce088df33cf9e51b90a8e SHA512 97ac20f16d4518c8cbe944e5c80089fa6bb75d4632fb9f3c9d9891aaddb0e0f2209f6e854317f3d3b41bfb330c9d3ed830f3797f0120d4b1863b1d6fa3b9c07b @@ -227,6 +228,7 @@ DIST pledge-0.4.2.crate 4779 BLAKE2B 16e7f1d8bf8881050478a2b5a261723f9d41443d761 DIST polling-2.8.0.crate 43554 BLAKE2B 8fc5986db7c34989954bbe84bd69d1f61c59b890d4e5fd21a20f3861bad750aafe2d1a89b3181df97f3659f1a6c980a92e43dcb9ef9e1de3881518024caa6f58 SHA512 c22dc35f39f374f21483c987d43108472dbfc291508e3f5e1d76e2c466f40b396b1ba7c222db5e5a2c0e670e83b4c34e0fbb5c3e93d86435b8a2ebb0890471a2 DIST portaudio-rs-0.3.2.crate 13267 BLAKE2B fc47e0d51d7aadb9358c1602659f823a70fe5addb75fc628fea78e08904cceabc8d9b7cfab738f21b054cbf6dd104036d8a7fbfa3b1ff82106749a278dc45a2d SHA512 cf2b9250fec8aba6a5095b0838279e39beab5cb5f077330e6185dc146e049c6a8580aba883493fe497ca20c2b64db24851c81de43e48fe19ab876418d3b910d2 DIST portaudio-sys-0.1.1.crate 2327 BLAKE2B 2b2b3312138c2e23ebbec4ac120e7f93eb535325b95fc4cdadab96e82b1fdb3d541d62c8563ce85b5a46c22ef364907177a2de943f697600d98dd99b27500fbe SHA512 221ba8f669048ed4eed4006b5eda45b8289e05fbf0b133809c64ed6c9b65714dc62a867edde3ef960ae5f644b91a0ab4f65b5bf259e8c4b75d63f58009c3abd4 +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a DIST priority-queue-1.3.2.crate 33905 BLAKE2B 2bd083a8ef4e6025fcd2de360a29442da3190d642a176cfec240743e060fb4c54dbc4c1e86fd10259296dbdf69accb802033594bd8aee9c664d684f6f983188c SHA512 8f0b05aabad32201b69e1c7d410df43d38ebece63c2b7c0510ae41733547f3df71cc93d100d2241453e0caa490a0b6e5f66d67a6fc05dd0463227cf8b364c7f4 DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659 @@ -311,9 +313,9 @@ DIST thiserror-impl-1.0.47.crate 15080 BLAKE2B 4b8084ae885160607905333dbac228757 DIST thread-id-4.2.0.crate 8551 BLAKE2B 6d9914f41d5a264328e51ff5c80544506adcbd3be308ffb63f7fad7406e280de5c6d1d5159f3f6bd7662e3c999130af2778e7660a3dbeca7086943022d44a332 SHA512 0c9a608c6839b6261a653d9911e92d9e3793823510cf389c9908c0b9a6744fe49d3d3a9612316cc4d665c439e3b62386fab30f5fe9509f29e7a6912902d4004a DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31 DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee -DIST time-0.3.28.crate 117447 BLAKE2B f566dca385815e7cf77efce568207b654ab51170f37d2ad6f447125f815623f70fb5d21932d3f2b6e97e6106be607b49b10f6ea3ddfc6f5f6c443a2825f51756 SHA512 97bc516631586d089797a5a35bf7d487084f1f1ad8b59a5a5454c07c2cb4f20de666ebb67c5ff539cab3fd2dd0c2498f3a4d4ae64541c0f3b1f56abccd58dcce -DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 -DIST time-macros-0.2.14.crate 23766 BLAKE2B 15ad8697849aeb0098c0841f9f73fa117175b819c49e0dacacdca1d06df69c997f4655aa3ca8a4c5c7022d84615cdae37c793304152cb9f98b4eed0f1c293e46 SHA512 df10aadebfd0215c4b4c7b1240ec4f000869dbdf484bd0d8d9f08fee59567690733007590d77ce700bf2fbf244bf5e4920f9962cc215b0f66cf4fe9892bdf380 +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.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e DIST tokio-1.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2 diff --git a/media-sound/spotifyd/files/spotifyd-0.3.5_p20240513-rust-1.80.patch b/media-sound/spotifyd/files/spotifyd-0.3.5_p20240513-rust-1.80.patch new file mode 100644 index 000000000..e3b90b858 --- /dev/null +++ b/media-sound/spotifyd/files/spotifyd-0.3.5_p20240513-rust-1.80.patch @@ -0,0 +1,113 @@ +https://bugs.gentoo.org/945307 +Bump time crate to 0.3.36. +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -554,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"; + checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" + dependencies = [ + "percent-encoding", +- "time 0.3.28", ++ "time 0.3.36", + "version_check", + ] + +@@ -571,7 +571,7 @@ dependencies = [ + "serde", + "serde_derive", + "serde_json", +- "time 0.3.28", ++ "time 0.3.36", + "url", + ] + +@@ -761,9 +761,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derivative" +@@ -2015,6 +2018,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index"; ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-derive" + version = "0.3.3" +@@ -2337,6 +2346,12 @@ dependencies = [ + "pkg-config", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index"; ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -3102,7 +3117,7 @@ dependencies = [ + "hostname", + "libc", + "log", +- "time 0.3.28", ++ "time 0.3.36", + ] + + [[package]] +@@ -3190,14 +3205,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3205,16 +3222,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/media-sound/spotifyd/spotifyd-0.3.5_p20240513.ebuild b/media-sound/spotifyd/spotifyd-0.3.5_p20240513.ebuild index d77ee43b0..f7eaef352 100644 --- a/media-sound/spotifyd/spotifyd-0.3.5_p20240513.ebuild +++ b/media-sound/spotifyd/spotifyd-0.3.5_p20240513.ebuild @@ -79,7 +79,7 @@ CRATES=" [email protected] [email protected] [email protected] - [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -200,6 +200,7 @@ CRATES=" [email protected] [email protected] [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -235,6 +236,7 @@ CRATES=" [email protected] [email protected] [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -317,10 +319,10 @@ CRATES=" [email protected] [email protected] [email protected] - [email protected] - [email protected] + [email protected] + [email protected] [email protected] - [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -419,6 +421,11 @@ DEPEND="media-libs/alsa-lib RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + # bug #945307 + "${FILESDIR}/${P}-rust-1.80.patch" +) + QA_FLAGS_IGNORED="usr/bin/spotifyd" src_configure() {
