public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/
@ 2016-06-28 22:20 Mike Gilbert
  0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2016-06-28 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e105a00cab63d93cb86e59a6b2663e283a732fe2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 22:19:46 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 22:20:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e105a00c

dev-python/pyzmq: fix build with cython-0.24

Bug: https://bugs.gentoo.org/583192

Package-Manager: portage-portage_p2.3.0

 dev-python/pyzmq/files/pyzmq-cython-0.24.patch | 33 ++++++++++++++++++++++++++
 dev-python/pyzmq/pyzmq-15.2.0.ebuild           |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/dev-python/pyzmq/files/pyzmq-cython-0.24.patch b/dev-python/pyzmq/files/pyzmq-cython-0.24.patch
new file mode 100644
index 0000000..55be83e
--- /dev/null
+++ b/dev-python/pyzmq/files/pyzmq-cython-0.24.patch
@@ -0,0 +1,33 @@
+From 659f9211aad1565543e26ef6877456d017c9d5bb Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Tue, 8 Mar 2016 09:17:05 +0100
+Subject: [PATCH] remove unused, deprecated `_handle`
+
+Cython 0.24 may not support property assignment
+---
+ zmq/backend/cython/context.pyx | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/zmq/backend/cython/context.pyx b/zmq/backend/cython/context.pyx
+index 2cb7409..3595c10 100644
+--- a/zmq/backend/cython/context.pyx
++++ b/zmq/backend/cython/context.pyx
+@@ -108,16 +108,12 @@ cdef class Context:
+             if self._n_sockets:
+                 # move last handle to closed socket's index
+                 self._sockets[idx] = self._sockets[self._n_sockets]
+-    
+-    
++
+     @property
+     def underlying(self):
+         """The address of the underlying libzmq context"""
+         return <size_t> self.handle
+-    
+-    # backward-compat, though nobody is using it
+-    _handle = underlying
+-    
++
+     cdef inline int _term(self):
+         cdef int rc=0
+         if self.handle != NULL and not self.closed and getpid() == self._pid:

diff --git a/dev-python/pyzmq/pyzmq-15.2.0.ebuild b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
index 2ed5a56..022dfdf 100644
--- a/dev-python/pyzmq/pyzmq-15.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}/pyzmq-cython-0.24.patch" )
+
 python_prepare_all() {
 	# Prevent un-needed download during build
 	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/
@ 2022-07-17 15:56 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-07-17 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     123c8792eb39d31c22071719ed5624a1dedf11df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 15:55:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 15:55:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123c8792

dev-python/pyzmq: fix libdir usage

Closes: https://bugs.gentoo.org/854627
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch | 11 ++++
 dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild          | 81 ++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch b/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch
new file mode 100644
index 000000000000..66d16f24ad73
--- /dev/null
+++ b/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/854627
+--- a/setup.py
++++ b/setup.py
+@@ -275,7 +275,6 @@ def settings_from_prefix(prefix=None):
+                 and platform.architecture()[0] == '64bit'
+             ):
+                 settings['library_dirs'] += [pjoin(prefix, 'lib/amd64')]
+-            settings['library_dirs'] += [pjoin(prefix, 'lib')]
+         else:
+             # If prefix is not explicitly set, pull it from pkg-config by default.
+             # this is probably applicable across platforms, but i don't have

diff --git a/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
new file mode 100644
index 000000000000..d68843bf062b
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	local EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest -p no:flaky
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/
@ 2023-09-11 16:52 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-09-11 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     480f4de74b647be094ab6a88f9eca78eae9e25a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 16:42:53 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 16:42:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480f4de7

dev-python/pyzmq: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyzmq/Manifest                          |  2 -
 .../pyzmq/files/pyzmq-25.1.0-build_ext.patch       | 50 ------------
 dev-python/pyzmq/pyzmq-25.0.2.ebuild               | 91 ----------------------
 dev-python/pyzmq/pyzmq-25.1.0.ebuild               | 89 ---------------------
 4 files changed, 232 deletions(-)

diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 3d938ca11667..64ba51e9228b 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1 @@
-DIST pyzmq-25.0.2.gh.tar.gz 398050 BLAKE2B 501aea8b46ef5c06ca75489869047b2e6aefd06d121b540fdfc85c45ea2f9a40b58b84433555d8001fbfb1671ad6df1953c79567aabc8cffba26516a4a60626c SHA512 dcba8fb561d1be135ba03e28078ed68835dc20a52ef9c47be240bd1edd37eb92d4da184045e8eff666f3d84a376ae35ca08172fc207823b5255160e9e3b1ef01
-DIST pyzmq-25.1.0.gh.tar.gz 399044 BLAKE2B c5507819844f174fcc5245fd89e6bff231ddc99add2c431a77a73955ce5e874f7387727380dee6a0618842762ed19a867699efed69c7997d5d4bcca480e30c44 SHA512 5a2a80162da4d1eb34cc13bc831cf01b98a1cfb62dd0595b81e47e77d752ecd59110fd447e5a936f74239253073fc5ceb6451e924928cd2c472e2ac61d26a78c
 DIST pyzmq-25.1.1.gh.tar.gz 389825 BLAKE2B d8e231a0eeaa6a7ad372da912cb42e96e4d862e163859b97d1c369a7940e019c074fc717685f53da06de69cfee79430e343fcd1987d768f3cc99ec75cad0955b SHA512 4aa0d5d5c1036e6ac35898c48d9612f677ee6e9345fafd02091ba81a5081f1ac8bf552eb5c03636ad643cc87e17f037013ec981d9b852c0252d30de8ce046d5a

diff --git a/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch b/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch
deleted file mode 100644
index 491ae6b23ea4..000000000000
--- a/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 24d65e10bee5b68751dc36e2ee7e6d6ed35751e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 27 May 2023 07:11:24 +0200
-Subject: [PATCH] =?UTF-8?q?Call=20distutils'=20finalize=5Foptions()=20earl?=
- =?UTF-8?q?y=20to=20fix=20build=5Fext=20-j=E2=80=A6?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Call the `finalize_options()` method of overridden distutils commands
-before running the `configure` command, in order to fix errors due
-to unconfigured `--jobs` option.  This can be reproduced by running:
-
-    $ python setup.py build_ext -j12
-    […]
-    error: '<' not supported between instances of 'str' and 'int'
-
-    Fatal: Falling back on bundled libzmq, but config has explicitly prohibited building the libzmq extension.
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index c52723d1..a4f8b4e3 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1107,9 +1107,9 @@ class CheckingBuildExt(build_ext):
-         patch_lib_paths(ext_path, self.compiler.library_dirs)
- 
-     def finalize_options(self):
-+        super().finalize_options()
-         # check version, to prevent confusing undefined constant errors
-         self.distribution.run_command("configure")
--        return super().finalize_options()
- 
- 
- class ConstantsCommand(Command):
-@@ -1258,8 +1258,8 @@ else:
-             patch_lib_paths(ext_path, self.compiler.library_dirs)
- 
-         def finalize_options(self):
-+            super().finalize_options()
-             self.distribution.run_command("configure")
--            return super().finalize_options()
- 
-     cmdclass["cython"] = CythonCommand
-     cmdclass["build_ext"] = zbuild_ext
--- 
-2.40.1
-

diff --git a/dev-python/pyzmq/pyzmq-25.0.2.ebuild b/dev-python/pyzmq/pyzmq-25.0.2.ebuild
deleted file mode 100644
index c43410d1bcd3..000000000000
--- a/dev-python/pyzmq/pyzmq-25.0.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# TODO: Find out exactly where this error comes from
-# error: '<' not supported between instances of 'str' and 'int'
-#DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://zeromq.org/languages/python/
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="drafts"
-
-# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
-"
-# It uses cffi backend for pypy, cython backend for cpython
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/cffi:=[${PYTHON_USEDEP}]
-	' pypy3)
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
-)
-
-EPYTEST_DESELECT=(
-	# TODO
-	zmq/tests/test_constants.py::TestConstants::test_draft
-	zmq/tests/test_cython.py::test_cython
-
-	# Hangs often
-	zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
-)
-
-EPYTEST_IGNORE=(
-	# Avoid dependency on mypy
-	zmq/tests/test_mypy.py
-
-	# Broken upstream
-	zmq/tests/test_auth.py
-
-	# pytest-asyncio incompatibility?
-	zmq/tests/test_zmqstream.py
-)
-
-distutils_enable_tests pytest
-# TODO: Package enum_tools
-# distutils_enable_sphinx docs/source \
-# 	dev-python/numpydoc \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/myst-parser
-
-python_prepare_all() {
-	export ZMQ_DRAFT_API=$(usex drafts '1' '0')
-	export ZMQ_PREFIX="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	epytest -p no:flaky
-}

diff --git a/dev-python/pyzmq/pyzmq-25.1.0.ebuild b/dev-python/pyzmq/pyzmq-25.1.0.ebuild
deleted file mode 100644
index beb30b72d634..000000000000
--- a/dev-python/pyzmq/pyzmq-25.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# TODO: Find out exactly where this error comes from
-# error: '<' not supported between instances of 'str' and 'int'
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://zeromq.org/languages/python/
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/
-"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="drafts"
-
-# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
-"
-# It uses cffi backend for pypy, cython backend for cpython
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/cffi:=[${PYTHON_USEDEP}]
-	' pypy3)
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
-	# fix build_ext -j... invocation used by PEP517 build
-	# https://github.com/zeromq/pyzmq/pull/1872
-	"${FILESDIR}"/${P}-build_ext.patch
-)
-
-EPYTEST_DESELECT=(
-	# TODO
-	zmq/tests/test_auth.py
-	zmq/tests/test_cython.py
-	zmq/tests/test_zmqstream.py
-)
-
-EPYTEST_IGNORE=(
-	# Avoid dependency on mypy
-	zmq/tests/test_mypy.py
-)
-
-distutils_enable_tests pytest
-# TODO: Package enum_tools
-# distutils_enable_sphinx docs/source \
-# 	dev-python/numpydoc \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/myst-parser
-
-python_prepare_all() {
-	export ZMQ_DRAFT_API=$(usex drafts '1' '0')
-	export ZMQ_PREFIX="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -p asyncio -p rerunfailures
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/
@ 2024-05-26 12:41 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-05-26 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     7d942cabf868796005cd14dbab4838f3759d94e5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 12:15:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 26 12:41:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d942cab

dev-python/pyzmq: Backport a GCC 14 build fix

Closes: https://bugs.gentoo.org/918999
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch | 53 +++++++++++++++++++++++++
 dev-python/pyzmq/pyzmq-26.0.3.ebuild            |  5 +++
 2 files changed, 58 insertions(+)

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 <benjaminrk@gmail.com>
+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 <benjaminrk@gmail.com>
+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)"


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-05-26 12:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-17 15:56 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-05-26 12:41 Michał Górny
2023-09-11 16:52 Michał Górny
2016-06-28 22:20 Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox