diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2020-04-01 13:30:58 +0200 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2020-04-01 13:37:20 +0200 |
| commit | 21cb847419eda46b9ed7d040ea224ff58a0b922f (patch) | |
| tree | cadd3020b0b19f3f9f6c2ec6b90412c1740d2091 /dev-python/hiredis | |
| parent | dev-python/hiredis: Pin 0.2.0-r1 to old dev-libs/hiredis (diff) | |
| download | gentoo-21cb847419eda46b9ed7d040ea224ff58a0b922f.tar.gz gentoo-21cb847419eda46b9ed7d040ea224ff58a0b922f.tar.bz2 gentoo-21cb847419eda46b9ed7d040ea224ff58a0b922f.zip | |
dev-python/hiredis: Revision bump for new dev-libs/hiredis API
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'dev-python/hiredis')
| -rw-r--r-- | dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch | 32 | ||||
| -rw-r--r-- | dev-python/hiredis/hiredis-0.2.0-r3.ebuild (renamed from dev-python/hiredis/hiredis-0.2.0-r2.ebuild) | 7 |
2 files changed, 37 insertions, 2 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/hiredis-0.2.0-r2.ebuild b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild index e5ca7fa47cfd..c6aca79094e8 100644 --- a/dev-python/hiredis/hiredis-0.2.0-r2.ebuild +++ b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild @@ -15,7 +15,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -DEPEND=">=dev-libs/hiredis-0.13.1:=" +DEPEND=">=dev-libs/hiredis-0.14:=" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch ) +PATCHES=( + "${FILESDIR}"/${P}-r1-system-libs.patch + "${FILESDIR}"/${P}-api-0.14.patch +) |