From 3c1648a0749c1d66b300d857e6b417c1162890da Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 27 May 2024 00:07:23 +0100 Subject: gentoo auto-resync : 27:05:2024 - 00:07:23 --- dev-python/pyzmq/Manifest | 3 +- dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch | 53 +++++++++++++++++++++++++ dev-python/pyzmq/pyzmq-26.0.3.ebuild | 5 +++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch (limited to 'dev-python/pyzmq') diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index 427949012329..234a62d36c71 100644 --- a/dev-python/pyzmq/Manifest +++ b/dev-python/pyzmq/Manifest @@ -1,8 +1,9 @@ AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8eca14ae909b23e68231a65b3ad36d021b5c6f5315a3cb982cd571913ce021cc5df60509d90b28d4353dd7bd316e8 SHA512 f268d03de45971d50a89210366b4aef0e79e652a45d650fc3e4a6711558ee186ee558a2808b7c9f5c5a64ce8b9282adf024ab21a782ba614900a4813e8b6d6ca +AUX pyzmq-26.0.3-gcc14.patch 1443 BLAKE2B 94e7f84b5f3e29a7e72d33b810d44fcd2cc8a4d14a10fe624e405e24c7ba15a1a4bfa8f96b11583434135d1fa9730b97f566e9c612152a5d11a9c55f50d39a0e SHA512 4db9ceb343425069fdcb8cb4551c21e26dba396519678ecff3a4ae8f337343242fef9b5ee40fb94e2aad7b5b3052af0e8d6287c3230a1e994b3d41a31297b7df DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283efcd1f3994155334aa5b60c4b6cd89167de8c78d19f8efdbeb5f4071f7b5954ea911eb6e7fbb48a0087b86579cab SHA512 b146a6dbce7cbbe2eb1da7ebd64e463067354f1566cdb4ff634b59bbb6d65e16263b6acb2d101a4ea53f870be5c753c9a12f9cc37bc5a81236681ea4fda6c56b DIST pyzmq-26.0.2.gh.tar.gz 267895 BLAKE2B c71a0149cb6c596dfcbc760376aa14afa69bd927fcc739698f7d2ea44579dc8437ae605745b383a9b317ff66c092a4f963671e7933cf19f3f73acac16ac06daa SHA512 5772743e71810f9a0c332dcf16f04237eeb0a34ef2efdd22b63258ebe93e6b493a79845090e677a33582a9a80e7bee773160ec7ecfdaf240b655f3819e5b67a5 DIST pyzmq-26.0.3.gh.tar.gz 268927 BLAKE2B 7504a45776e8c618833702563b50f672a3ecabb3353551ea61d2d2343dd9e955d1d2938046c2f90d115255482b9b6b2c0f1817b238e591b9319ac92a4341c04a SHA512 f4a32164daf9d9521be83008a94089406078779b9e0e56812a826df1fb295cc03781566825697313aa0c2b36b85b0bb760b8fb90959a856a0542b9072cde78c9 EBUILD pyzmq-25.1.2.ebuild 2307 BLAKE2B 518a210ee7f2b29debae65a154c954e299e433a490808aac7169b5955341db1b371949f3a18c256ac9aff30669eafd42c027140a3219e9b15b7b01dccd56b1b2 SHA512 e97f310487ff3b94e1476b9af92437f639e20751b93ad54dc6955c4bf58d2f9d1c02fa36603bdd470d4da1f78712d31c998c909d1c36da73d4a97236b2a1c379 EBUILD pyzmq-26.0.2.ebuild 2119 BLAKE2B d1c3334be13d7fbb8d500b8512f0cec65473dff05b1ea3f63e1a2b03b63c585e1c26b7442bb445fb7b3e42ee425030b0de291fc01f226cccb9b4c9bc23f53f80 SHA512 c4d6477b68d4deb123dc20f93b0978c01b4318f52a9d032aebf6836cc29ad83dc25b7c3515dd99889d31eea0a5ab240c120a1f41b6afcbfebe365c3ca5c7e902 -EBUILD pyzmq-26.0.3.ebuild 2116 BLAKE2B 2249b703b1c462a28028a5e592123c14b0c0d2c9c23499778999bad78195fa19d53ef325f3c7fabb62d1132940f20625a02755de1e7ddb95ee2253faf4b95010 SHA512 7f65eb108c0311beb9281f88309c34eebcf366a9d87c2a3c31dc65dfe3a3197e6e845edca624fe7bb8e9371fac0d438a5e12f002a0df77d159ff8a3a378784d4 +EBUILD pyzmq-26.0.3.ebuild 2206 BLAKE2B 8c03a9700b8010e5de3784f329dde526a805dd5246a2002da608202f3c56f06fa3aa6a04fd24c36ede2d425cb88e9994c3a6cca63f2a9dabbbb1405dbde1fbcc SHA512 a314d8d61a0b3ce7601ef047dcd38fc0ff4e7ef21d464d7365d38e8de5f0245285438ec7085934585deb642c5a56bf46710c515879f23b52e34da369bdfdb405 MISC metadata.xml 549 BLAKE2B 46a9a1476f68f05c71bb4f849a9e0822c58142ac036da635454f57781dcea81687accfbf9563273d4f8672a8479b098c9f03cec64e5e7f456e50ad8c7ffba9d3 SHA512 3765c31f1b0048a60d5ccf90aa1fa5416c92addb7b01c62e529419e53a4e29746d0e4434d4d4fbd5918413e7521144c8758cdef9eacf5298108c2287783908c1 diff --git a/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch b/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch new file mode 100644 index 000000000000..8d87af8b7289 --- /dev/null +++ b/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch @@ -0,0 +1,53 @@ +From bc5e214e957eb96c7e23b2c46a075e3850805ff1 Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Thu, 16 May 2024 08:34:51 +0200 +Subject: [PATCH 1/2] cffi: fix type of hint mutex pointer + +--- + zmq/backend/cffi/_cdefs.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h +index 6c9a06558..cf27f5b4e 100644 +--- a/zmq/backend/cffi/_cdefs.h ++++ b/zmq/backend/cffi/_cdefs.h +@@ -75,13 +75,14 @@ void * malloc(size_t sz); + void free(void *p); + int get_ipc_path_max_len(void); + ++typedef ... mutex_t; ++ + typedef struct _zhint { + void *sock; +- void *mutex; ++ mutex_t *mutex; + size_t id; + } zhint; + +-typedef ... mutex_t; + mutex_t* mutex_allocate(); + + int zmq_wrap_msg_init_data(zmq_msg_t *msg, + +From b180ebc07fc04b0576fef50c3969fd48fa58694d Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Sun, 26 May 2024 00:29:06 +0200 +Subject: [PATCH 2/2] maybe it needs to specify struct + +--- + zmq/backend/cffi/_cdefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h +index cf27f5b4e..7833b9b26 100644 +--- a/zmq/backend/cffi/_cdefs.h ++++ b/zmq/backend/cffi/_cdefs.h +@@ -75,7 +75,7 @@ void * malloc(size_t sz); + void free(void *p); + int get_ipc_path_max_len(void); + +-typedef ... mutex_t; ++typedef struct { ...; } mutex_t; + + typedef struct _zhint { + void *sock; diff --git a/dev-python/pyzmq/pyzmq-26.0.3.ebuild b/dev-python/pyzmq/pyzmq-26.0.3.ebuild index 15cac8e4fcbe..bb7ea1838d2b 100644 --- a/dev-python/pyzmq/pyzmq-26.0.3.ebuild +++ b/dev-python/pyzmq/pyzmq-26.0.3.ebuild @@ -53,6 +53,11 @@ distutils_enable_tests pytest # dev-python/sphinx-rtd-theme \ # dev-python/myst-parser +PATCHES=( + # https://github.com/zeromq/pyzmq/pull/1990 + "${FILESDIR}/${P}-gcc14.patch" +) + src_configure() { DISTUTILS_ARGS=( -DZMQ_DRAFT_API="$(usex drafts)" -- cgit v1.2.3