gentoo auto-resync : 19:05:2024 - 00:01:59

3 files changed, 32 insertions, 2 deletions

diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index bf76af2646dc..1a4778d8ed86 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,5 +1,6 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
 AUX tree-sitter-0.21.0-unbundle.patch 516 BLAKE2B 9bee97b5563088af7ff31aaa9da2e2a0a5ddb54b84d5520994df5a6e9e8472e166ce50c23c7c77e1f495cc3139a532c710dc95e17c5ddcb35c56072538931a99 SHA512 9a583f4c4eb614afb7e6d6961cdf0390a0d45f54b0860a59fe6f2dc4fe0fdce0767fb2c5bd809ffc5aa7ce153c79b162dcbb41e05e0d7540614ab23da5889c74
+AUX tree-sitter-0.22.2-fix-32-bit.patch 1128 BLAKE2B 0b5c17a281cb7416e31cef1631b392c561b8e96860be9213ad41c44d0d287c1c929e93dc39e42a942e29bae5838c300f9da9509b3b4c9cf7b7a4db649fa405b6 SHA512 be984bf9c11f8b793b57794178b92dd971dadd88c4b5a2b738ef1d8c4b9010b4c33a09240a7f96a749442d4767acc2c0d304fe4dc6722168f0e5739905d8b8c5
 AUX tree-sitter-0.22.2-unbundle.patch 819 BLAKE2B 2190f524ad43240e90269ef475a7290948080d99bf49e0431c0334affa902a4aa6682f9ad723862722606ebf76988089c22adbbcba7d01024a93e96c438dbadc SHA512 4fd8e0b642277c7ea44dfd93d4c4bff46ce8f11cae558d7c5ad189fa69d9676949bd8aff3c468b2fdae4e74a63c08e96f2e1bf8152c58380b2bc66971079fdd2
 DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
 DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
@@ -16,5 +17,5 @@ DIST tree-sitter-rust-3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz 419237 BLA
 EBUILD tree-sitter-0.20.1-r1.ebuild 1472 BLAKE2B bfcd5ebcb8b1a1a1e799de1918da3c786e8da7e6a729f0054c1e49c0e0fdf273d58522896b54b385cea4733fefea5c01f39261de90156ef7dfd7a9503eb225a1 SHA512 2f9a69474f454d0e24e669f6bffc577ce5073cc20e8d8c3e609d048e8ef9e4eeaa6d3c8a39b3b9c066f8a67598aaf6171fb414cf20088f12d685127c515ddb5f
 EBUILD tree-sitter-0.21.0-r1.ebuild 1973 BLAKE2B 70a9e109defdd73ae48095eb78d71736913358882aa9598fddad0cd2fd24b51848293e968c73ae9638a7395420b3873dd377d4075ef91b1dc50e7f3285cafdc8 SHA512 0ed1bc400cfc8854c3379ad1d94d9ff4b555d4bd2fbbcbf822048e93dbd358a5a76d394d11c79dc17e964abf8e703364ea1d3c55d9af431d182aa26c35cc28ed
 EBUILD tree-sitter-0.21.3.ebuild 1981 BLAKE2B dc55662ac169854a85d177ac9d23007ed9c4bb52e10e8729da68991b9e7d5d70df5979b008e88052d01072f4655e0f419879b28653faee49f79b41185b3ab5ce SHA512 2a1de2831590e26cee3b053799cf32b228e33726bd0cc83d0cc619f237ac04d605f4240e382891f468818ecd8d6558b50f822ee7305417d9172cbf3f891e6c43
-EBUILD tree-sitter-0.22.2.ebuild 1309 BLAKE2B 764132e06e3c57afd36b2605cffdc94e300997d451b07a813d2b58f5793acdba0e541d8fccf576d0dce307453bb649cfcac8563c9d029eeb28de7ee37ae59322 SHA512 e37151c4057ddbc69039e2563ff0b2f0e266032f4d6286f903e71143c41a027716740072ad598e9e7c1fff6d43f47420ecbc561aa4eaed0af2ad494d45044afc
+EBUILD tree-sitter-0.22.2-r1.ebuild 1389 BLAKE2B 6f09b9eebbd9b6c11fef302d9083a2aa151028431e03d9a89831913de7a8e221a726b663fae551232b7448ecf4ae797cfd48281a289e21bb91ffd31e77e5329c SHA512 c264c6b23a1674089cc5c8cb7bbcdea595f6394ce435ee989f6410a17dd062033ace4bde60bd16f33199b99be37a268ae02c6d34ad9a8cd95dabb9feb8cab4be
 MISC metadata.xml 502 BLAKE2B cad33788db5ede6c0c2ea8dd8b80da09f2f8ccac8d77a1a18d65ba639a91eb9d8a89036a52886777024c4a6dc8775993beeb6eaa790562d698123e5b5b261435 SHA512 fb56c5f39e390363c8a3c80bddff9babcf30c74b86192234153f03ba62e21f1a05b1db925e51a3f4b7876a61a606b051a5314f5475d4ba7092a3f89696a78ac3
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch b/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
new file mode 100644
index 000000000000..c7d86953fa21
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
@@ -0,0 +1,27 @@
+https://github.com/tree-sitter/py-tree-sitter/commit/85e49483b6d2b49953568d95cfa03e539bfb8179
+From: ObserverOfTime <chronobserver@disroot.org>
+fix(language): use uintptr_t
+
+--- a/tests/test_language.py
++++ b/tests/test_language.py
+@@ -18,7 +18,6 @@ def setUp(self):
+         self.rust = tree_sitter_rust.language()
+
+     def test_init_invalid(self):
+-        self.assertRaises(ValueError, Language, -1)
+         self.assertRaises(ValueError, Language, 42)
+
+     def test_properties(self):
+--- a/tree_sitter/binding/language.c
++++ b/tree_sitter/binding/language.c
+@@ -5,8 +5,8 @@ int language_init(Language *self, PyObject *args, PyObject *Py_UNUSED(kwargs)) {
+     if (!PyArg_ParseTuple(args, "O:__init__", &language)) {
+         return -1;
+     }
+-    Py_ssize_t language_id = PyLong_AsSsize_t(language);
+-    if (language_id < 1 || (language_id % sizeof(TSLanguage *)) != 0) {
++    Py_uintptr_t language_id = PyLong_AsSize_t(language);
++    if (language_id == 0 || (language_id % sizeof(TSLanguage *)) != 0) {
+         if (!PyErr_Occurred()) {
+             PyErr_SetString(PyExc_ValueError, "invalid language ID");
+         }
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
index 85c88a0273ea..5560b9fb2c6f 100644
--- a/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
@@ -44,7 +44,9 @@ BDEPEND="
 distutils_enable_tests pytest
 
 PATCHES=(
-	"${FILESDIR}"/tree-sitter-0.22.2-unbundle.patch
+	"${FILESDIR}"/${PN}-0.22.2-unbundle.patch
+	# Fix 32-bit build, upstream, drop on next bump
+	"${FILESDIR}"/${P}-fix-32-bit.patch
 )
 
 src_unpack() {