commit:     cc56d34e57015aeb6fda1f28a60b5c7a942f11fc
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail 
<DOT> com>
AuthorDate: Fri Sep 16 15:46:51 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:28:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc56d34e

dev-python/psycopg: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2343

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/psycopg-2.0.9-round-solaris.patch        | 13 ---------
 .../files/psycopg-2.4.2-begin-segfault.patch       | 34 ----------------------
 2 files changed, 47 deletions(-)

diff --git a/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch 
b/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch
deleted file mode 100644
index 49d230c..00000000
--- a/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-round() is available on Solaris
-
---- psycopg/config.h
-+++ psycopg/config.h
-@@ -102,7 +102,7 @@
- #define inline
- #endif
- 
--#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) 
&& !defined(__GNUC__)) || defined(__sun__) || defined(sun)
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) 
&& !defined(__GNUC__))
- /* what's this, we have no round function either? */
- static double round(double num)
- {

diff --git a/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch 
b/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch
deleted file mode 100644
index cbf2278..00000000
--- a/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: 
https://dndg.it/cgi-bin/gitweb.cgi?p=public%2Fpsycopg2.git;a=blobdiff_plain;f=psycopg%2Fpqpath.c;h=1f0d5da95bd88aa4d5468874047e4b0139ffadd3;hp=cee5ce4c9c053981710959ca28b7e68702c44a97;hb=de6f2ac387231fcd57c05031c82471ea57255e2b;hpb=d9fce1f837151e6eadfd8ca761ef328a721198bd
-
-diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
-index cee5ce4..1f0d5da 100644
---- a/psycopg/pqpath.c
-+++ b/psycopg/pqpath.c
-@@ -344,11 +344,13 @@ pq_execute_command_locked(connectionObject *conn, const 
char *query,
-     }
-     if (*pgres == NULL) {
-         Dprintf("pq_execute_command_locked: PQexec returned NULL");
-+        PyEval_RestoreThread(*tstate);
-         if (!PyErr_Occurred()) {
-             const char *msg;
-             msg = PQerrorMessage(conn->pgconn);
-             if (msg && *msg) { *error = strdup(msg); }
-         }
-+        *tstate = PyEval_SaveThread();
-         goto cleanup;
-     }
- 
-@@ -635,11 +637,13 @@ pq_get_guc_locked(
- 
-     if (*pgres == NULL) {
-         Dprintf("pq_get_guc_locked: PQexec returned NULL");
-+        PyEval_RestoreThread(*tstate);
-         if (!PyErr_Occurred()) {
-             const char *msg;
-             msg = PQerrorMessage(conn->pgconn);
-             if (msg && *msg) { *error = strdup(msg); }
-         }
-+        *tstate = PyEval_SaveThread();
-         goto cleanup;
-     }
-     if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) {
\ No newline at end of file

Reply via email to