diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-python/hiredis/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-python/hiredis/files')
3 files changed, 79 insertions, 0 deletions
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch new file mode 100644 index 000000000000..c957ad7aa29d --- /dev/null +++ b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch @@ -0,0 +1,32 @@ +diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c +--- hiredis-0.2.0.orig/src/reader.c 2015-04-02 23:49:10.000000000 +0200 ++++ hiredis-0.2.0/src/reader.c 2020-04-01 13:26:50.504058251 +0200 +@@ -157,7 +157,7 @@ + }; + + static void Reader_dealloc(hiredis_ReaderObject *self) { +- redisReplyReaderFree(self->reader); ++ redisReaderFree(self->reader); + if (self->encoding) + free(self->encoding); + Py_XDECREF(self->protocolErrorClass); +@@ -267,7 +267,7 @@ + goto error; + } + +- redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len); ++ redisReaderFeed(self->reader, (char *)buf.buf + off, len); + PyBuffer_Release(&buf); + Py_RETURN_NONE; + +@@ -281,8 +281,8 @@ + PyObject *err; + char *errstr; + +- if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) { +- errstr = redisReplyReaderGetError(self->reader); ++ if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) { ++ errstr = redisReaderGetError(self->reader); + /* protocolErrorClass might be a callable. call it, then use it's type */ + err = createError(self->protocolErrorClass, errstr, strlen(errstr)); + obj = PyObject_Type(err); diff --git a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch new file mode 100644 index 000000000000..16c420228286 --- /dev/null +++ b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch @@ -0,0 +1,32 @@ +diff -Nur hiredis-1.0.1.orig/src/reader.c hiredis-1.0.1/src/reader.c +--- hiredis-1.0.1.orig/src/reader.c 2019-11-13 11:38:29.000000000 +0100 ++++ hiredis-1.0.1/src/reader.c 2020-04-01 13:15:19.852085240 +0200 +@@ -167,7 +167,7 @@ + static void Reader_dealloc(hiredis_ReaderObject *self) { + // we don't need to free self->encoding as the buffer is managed by Python + // https://docs.python.org/3/c-api/arg.html#strings-and-buffers +- redisReplyReaderFree(self->reader); ++ redisReaderFree(self->reader); + Py_XDECREF(self->protocolErrorClass); + Py_XDECREF(self->replyErrorClass); + +@@ -271,7 +271,7 @@ + goto error; + } + +- redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len); ++ redisReaderFeed(self->reader, (char *)buf.buf + off, len); + PyBuffer_Release(&buf); + Py_RETURN_NONE; + +@@ -290,8 +290,8 @@ + return NULL; + } + +- if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) { +- errstr = redisReplyReaderGetError(self->reader); ++ if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) { ++ errstr = redisReaderGetError(self->reader); + /* protocolErrorClass might be a callable. call it, then use it's type */ + err = createError(self->protocolErrorClass, errstr, strlen(errstr)); + if (err != NULL) { diff --git a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch new file mode 100644 index 000000000000..c11d0baa5639 --- /dev/null +++ b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch @@ -0,0 +1,15 @@ +diff -Nur hiredis-1.0.1.orig/setup.py hiredis-1.0.1/setup.py +--- hiredis-1.0.1.orig/setup.py 2019-11-13 11:38:29.000000000 +0100 ++++ hiredis-1.0.1/setup.py 2020-03-19 08:18:53.414214592 +0100 +@@ -11,9 +11,8 @@ + return module.__version__ + + ext = Extension("hiredis.hiredis", +- sources=sorted(glob.glob("src/*.c") + +- ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]), +- include_dirs=["vendor"]) ++ sources=sorted(glob.glob("src/*.c")), ++ libraries=["hiredis"]) + + setup( + name="hiredis", |