[neon/extras/kdb/Neon/stable] debian/patches: Revert "patch from master for postgres 12"

Jonathan Riddell null at kde.org
Mon Oct 26 14:51:35 GMT 2020


Git commit 1a936a3d718e99f0562ac00fec9121e6022302ae by Jonathan Riddell.
Committed on 26/10/2020 at 14:51.
Pushed by jriddell into branch 'Neon/stable'.

Revert "patch from master for postgres 12"

This reverts commit a8b03489b079091bb2012a8757b04d40d29fd03e.

D  +0    -31   debian/patches/postgres12.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/kdb/commit/1a936a3d718e99f0562ac00fec9121e6022302ae

diff --git a/debian/patches/postgres12.diff b/debian/patches/postgres12.diff
deleted file mode 100644
index d0ee32b..0000000
--- a/debian/patches/postgres12.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911
-Author: Pino Toscano <pino at kde.org>
-Date:   Tue Oct 29 07:52:32 2019 +0100
-
-    PgSQL driver: fix build with PostgreSQL 12+
-    
-    ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped.
-
-diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp
-index ea576d69..0697129e 100644
---- a/src/drivers/postgresql/PostgresqlTypes.cpp
-+++ b/src/drivers/postgresql/PostgresqlTypes.cpp
-@@ -36,6 +36,7 @@
- #endif
- #include <libpq-fe.h>
- #include <catalog/pg_type.h> // needed for BOOLOID, etc.
-+#include <pg_config.h> // needed for PG_VERSION_NUM
- 
- #ifdef _MSC_VER
- #pragma warning( pop )
-@@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap()
-     //! @todo POLYGONOID geometric polygon '(pt1,...)'
-     m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double);
-     m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double);
-+#if PG_VERSION_NUM < 120000
-     m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date);
-     m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date);
-+#endif
-     //! @todo TINTERVALOID (abstime,abstime), time interval
-     //! @todo CIRCLEOID geometric circle '(center,radius)'
-     //! @todo CASHOID monetary amounts, $d,ddd.cc
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0570496..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-postgres12.diff


More information about the Neon-commits mailing list