Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/hiredis/files/
Date: Tue, 02 Jun 2020 04:28:29
Message-Id: 1591072079.2faeb749e92da02b2bb0d93b1ab0ea051863517b.bman@gentoo
1 commit: 2faeb749e92da02b2bb0d93b1ab0ea051863517b
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue May 19 19:20:08 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 2 04:27:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2faeb749
7
8 dev-python/hiredis: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
12
13 .../hiredis/files/hiredis-0.2.0-api-0.14.patch | 32 ----------------------
14 .../files/hiredis-0.2.0-r1-system-libs.patch | 26 ------------------
15 2 files changed, 58 deletions(-)
16
17 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
18 deleted file mode 100644
19 index c957ad7aa29..00000000000
20 --- a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
21 +++ /dev/null
22 @@ -1,32 +0,0 @@
23 -diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c
24 ---- hiredis-0.2.0.orig/src/reader.c 2015-04-02 23:49:10.000000000 +0200
25 -+++ hiredis-0.2.0/src/reader.c 2020-04-01 13:26:50.504058251 +0200
26 -@@ -157,7 +157,7 @@
27 - };
28 -
29 - static void Reader_dealloc(hiredis_ReaderObject *self) {
30 -- redisReplyReaderFree(self->reader);
31 -+ redisReaderFree(self->reader);
32 - if (self->encoding)
33 - free(self->encoding);
34 - Py_XDECREF(self->protocolErrorClass);
35 -@@ -267,7 +267,7 @@
36 - goto error;
37 - }
38 -
39 -- redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
40 -+ redisReaderFeed(self->reader, (char *)buf.buf + off, len);
41 - PyBuffer_Release(&buf);
42 - Py_RETURN_NONE;
43 -
44 -@@ -281,8 +281,8 @@
45 - PyObject *err;
46 - char *errstr;
47 -
48 -- if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
49 -- errstr = redisReplyReaderGetError(self->reader);
50 -+ if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
51 -+ errstr = redisReaderGetError(self->reader);
52 - /* protocolErrorClass might be a callable. call it, then use it's type */
53 - err = createError(self->protocolErrorClass, errstr, strlen(errstr));
54 - obj = PyObject_Type(err);
55
56 diff --git a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
57 deleted file mode 100644
58 index 19d4bd8598f..00000000000
59 --- a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
60 +++ /dev/null
61 @@ -1,26 +0,0 @@
62 -diff -ur hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
63 ---- hiredis-0.2.0.orig/setup.py 2015-04-03 16:08:45.000000000 +0200
64 -+++ hiredis-0.2.0/setup.py 2018-04-22 16:57:15.966520939 +0200
65 -@@ -40,12 +40,11 @@
66 - # supported Python versions is worse...
67 - #
68 - # Also see: https://github.com/pietern/hiredis-py/issues/15
69 --lib = ("hiredis_for_hiredis_py", {
70 -- "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
71 -
72 - ext = Extension("hiredis.hiredis",
73 - sources=glob.glob("src/*.c"),
74 -- include_dirs=["vendor"])
75 -+ libraries=["hiredis"],
76 -+)
77 -
78 - setup(
79 - name="hiredis",
80 -@@ -57,7 +56,6 @@
81 - keywords=["Redis"],
82 - license="BSD",
83 - packages=["hiredis"],
84 -- libraries=[lib],
85 - ext_modules=[ext],
86 -
87 - # Override "install_lib" command