* [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml-clib/files/, dev-python/ruamel-yaml-clib/
@ 2023-08-20 12:51 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2023-08-20 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 0e656f10919ab3442cdbc868b932a1aa37d6d350
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 12:50:29 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 12:51:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e656f10
dev-python/ruamel-yaml-clib: support building with -Werror=incompatible-function-pointer-types
Closes: https://bugs.gentoo.org/880651
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...amel-yaml-clib-0.2.7_cython_pointer_types.patch | 75 ++++++++++++++++++++++
.../ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild | 4 ++
2 files changed, 79 insertions(+)
diff --git a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch
new file mode 100644
index 000000000000..855571f05bb0
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch
@@ -0,0 +1,75 @@
+--- a/_ruamel_yaml.pxd
++++ b/_ruamel_yaml.pxd
+@@ -2,15 +2,15 @@
+ cdef extern from "_ruamel_yaml.h":
+
+ void malloc(int l)
+- void memcpy(char *d, char *s, int l)
++ void memcpy(unsigned char *d, char *s, int l)
+ int strlen(char *s)
+ int PyString_CheckExact(object o)
+ int PyUnicode_CheckExact(object o)
+ char *PyString_AS_STRING(object o)
+ int PyString_GET_SIZE(object o)
+- object PyString_FromStringAndSize(char *v, int l)
++ object PyString_FromStringAndSize(unsigned char *v, size_t l)
+ object PyUnicode_FromString(char *u)
+- object PyUnicode_DecodeUTF8(char *u, int s, char *e)
++ object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e)
+ object PyUnicode_AsUTF8String(object o)
+ int PY_MAJOR_VERSION
+
+@@ -85,11 +85,11 @@
+ YAML_MAPPING_START_EVENT
+ YAML_MAPPING_END_EVENT
+
+- ctypedef int yaml_read_handler_t(void *data, char *buffer,
+- int size, int *size_read) except 0
++ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer,
++ size_t size, size_t *size_read) except 0
+
+- ctypedef int yaml_write_handler_t(void *data, char *buffer,
+- int size) except 0
++ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer,
++ size_t size) except 0
+
+ ctypedef struct yaml_mark_t:
+ int index
+@@ -112,7 +112,7 @@
+ char *handle
+ char *suffix
+ ctypedef struct _yaml_token_scalar_data_t:
+- char *value
++ unsigned char *value
+ int length
+ yaml_scalar_style_t style
+ ctypedef struct _yaml_token_version_directive_data_t:
+@@ -151,7 +151,7 @@
+ ctypedef struct _yaml_event_scalar_data_t:
+ char *anchor
+ char *tag
+- char *value
++ unsigned char *value
+ int length
+ int plain_implicit
+ int quoted_implicit
+--- a/_ruamel_yaml.pyx
++++ b/_ruamel_yaml.pyx
+@@ -904,7 +904,7 @@
+ raise error
+ return 1
+
+-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0:
++cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0:
+ cdef CParser parser
+ parser = <CParser>data
+ if parser.stream_cache is None:
+@@ -1514,7 +1514,7 @@
+ self.ascend_resolver()
+ return 1
+
+-cdef int output_handler(void *data, char *buffer, int size) except 0:
++cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0:
+ cdef CEmitter emitter
+ emitter = <CEmitter>data
+ if emitter.dump_unicode == 0:
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
index 73dd7fb50ddc..386c5a5ceb12 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
dev-python/cython[${PYTHON_USEDEP}]
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2.7_cython_pointer_types.patch
+)
+
src_unpack() {
default
mv "${MY_P}" ruamel_yaml_clib || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml-clib/files/, dev-python/ruamel-yaml-clib/
@ 2024-11-24 3:28 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-11-24 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 4e16a7ce9edecebdb77f0f6f2dd1339555be3f31
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 02:36:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 03:28:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e16a7ce
dev-python/ruamel-yaml-clib: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/ruamel-yaml-clib/Manifest | 2 -
...amel-yaml-clib-0.2.7_cython_pointer_types.patch | 75 ----------------------
.../ruamel-yaml-clib/ruamel-yaml-clib-0.2.8.ebuild | 44 -------------
.../ruamel-yaml-clib/ruamel-yaml-clib-0.2.9.ebuild | 40 ------------
4 files changed, 161 deletions(-)
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 780c88a5b465..cabd37fe11a0 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1 @@
DIST ruamel.yaml.clib-0.2.12.tar.gz 225315 BLAKE2B fdba5da04b387f5d983f3e31ff192d96d20d0c8f97622406bdde8515c59fe35995b031affe86c6eca59f1367548fa8aa87c4f19c378b2cddf5706a870b956509 SHA512 36715cfaa663f9948034d7eb64f1b9e9cf69971e27e5ac1f2cd54234c8889c91416fe95aa3f5cce44eb00c9c383f458457c3f5ba9e3afa3e5637c118ec2e5113
-DIST ruamel.yaml.clib-0.2.8.tar.xz 163768 BLAKE2B 38f41c45a4e043b01a80d725baeba5fd6e74fa56e86ad0c1e7e0b811f85fd92f98f3ac096419757bae2273537e7c31356d0d222896e631a39ddc36684ebf29e0 SHA512 3877bc6fcefab91f5d2bd013275f63bba6dd2f5ce1b29b74aef73d01638e184ff1f16ab1fbf9ccbf30d148a33f19dc2535ca8b5d8aecca8c48f1d3eef188e151
-DIST ruamel.yaml.clib-0.2.9.tar.xz 166220 BLAKE2B c65868c0c3e70f2e520252a85c7a973837f7b59aaf12e3a886dac0261d19e901ec508ede5cdfc573d17bec3b4ce6ad25abac2a3dc5ec84976a717bf750c550f8 SHA512 a7f1b54a661811632151abdb67804abf294c058bc487626472bc2b2b467c3fa7e3a9c3cbe45f87569f8f7ac67474e5f9e6b3031fbfb70d41b054d1c1ca59cb89
diff --git a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch
deleted file mode 100644
index 855571f05bb0..000000000000
--- a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.7_cython_pointer_types.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/_ruamel_yaml.pxd
-+++ b/_ruamel_yaml.pxd
-@@ -2,15 +2,15 @@
- cdef extern from "_ruamel_yaml.h":
-
- void malloc(int l)
-- void memcpy(char *d, char *s, int l)
-+ void memcpy(unsigned char *d, char *s, int l)
- int strlen(char *s)
- int PyString_CheckExact(object o)
- int PyUnicode_CheckExact(object o)
- char *PyString_AS_STRING(object o)
- int PyString_GET_SIZE(object o)
-- object PyString_FromStringAndSize(char *v, int l)
-+ object PyString_FromStringAndSize(unsigned char *v, size_t l)
- object PyUnicode_FromString(char *u)
-- object PyUnicode_DecodeUTF8(char *u, int s, char *e)
-+ object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e)
- object PyUnicode_AsUTF8String(object o)
- int PY_MAJOR_VERSION
-
-@@ -85,11 +85,11 @@
- YAML_MAPPING_START_EVENT
- YAML_MAPPING_END_EVENT
-
-- ctypedef int yaml_read_handler_t(void *data, char *buffer,
-- int size, int *size_read) except 0
-+ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer,
-+ size_t size, size_t *size_read) except 0
-
-- ctypedef int yaml_write_handler_t(void *data, char *buffer,
-- int size) except 0
-+ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer,
-+ size_t size) except 0
-
- ctypedef struct yaml_mark_t:
- int index
-@@ -112,7 +112,7 @@
- char *handle
- char *suffix
- ctypedef struct _yaml_token_scalar_data_t:
-- char *value
-+ unsigned char *value
- int length
- yaml_scalar_style_t style
- ctypedef struct _yaml_token_version_directive_data_t:
-@@ -151,7 +151,7 @@
- ctypedef struct _yaml_event_scalar_data_t:
- char *anchor
- char *tag
-- char *value
-+ unsigned char *value
- int length
- int plain_implicit
- int quoted_implicit
---- a/_ruamel_yaml.pyx
-+++ b/_ruamel_yaml.pyx
-@@ -904,7 +904,7 @@
- raise error
- return 1
-
--cdef int input_handler(void *data, char *buffer, int size, int *read) except 0:
-+cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0:
- cdef CParser parser
- parser = <CParser>data
- if parser.stream_cache is None:
-@@ -1514,7 +1514,7 @@
- self.ascend_resolver()
- return 1
-
--cdef int output_handler(void *data, char *buffer, int size) except 0:
-+cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0:
- cdef CEmitter emitter
- emitter = <CEmitter>data
- if emitter.dump_unicode == 0:
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.8.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.8.ebuild
deleted file mode 100644
index 0e3b8814b50d..000000000000
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml.clib/
- https://sourceforge.net/projects/ruamel-yaml-clib/
-"
-# sdist lacks .pyx files for cythonizing
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-# workaround https://bugs.gentoo.org/898716
-S=${WORKDIR}/ruamel_yaml_clib
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7_cython_pointer_types.patch
-)
-
-src_unpack() {
- default
- mv "${MY_P}" ruamel_yaml_clib || die
-}
-
-src_configure() {
- cython -f -3 _ruamel_yaml.pyx || die
-}
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.9.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.9.ebuild
deleted file mode 100644
index 211198d73cec..000000000000
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml.clib/
- https://sourceforge.net/projects/ruamel-yaml-clib/
-"
-# sdist lacks .pyx files for cythonizing
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-# workaround https://bugs.gentoo.org/898716
-S=${WORKDIR}/ruamel_yaml_clib
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_unpack() {
- default
- mv "${MY_P}" ruamel_yaml_clib || die
-}
-
-src_configure() {
- cython -f -3 _ruamel_yaml.pyx || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-24 3:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-24 3:28 [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml-clib/files/, dev-python/ruamel-yaml-clib/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-08-20 12:51 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox