From 1fa49886d46c5ad8ef2d3a6f346f5905ccd867b8 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 3 Feb 2020 22:29:49 +0300 Subject: [PATCH] applications --- .../kdb/files/kdb-3.2.0-build-w-pg12.patch | 35 +++++++++++++++++++ desktop/kde/applications/kdb/pspec.xml | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 desktop/kde/applications/kdb/files/kdb-3.2.0-build-w-pg12.patch diff --git a/desktop/kde/applications/kdb/files/kdb-3.2.0-build-w-pg12.patch b/desktop/kde/applications/kdb/files/kdb-3.2.0-build-w-pg12.patch new file mode 100644 index 0000000000..5329fae80d --- /dev/null +++ b/desktop/kde/applications/kdb/files/kdb-3.2.0-build-w-pg12.patch @@ -0,0 +1,35 @@ +From 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 29 Oct 2019 07:52:32 +0100 +Subject: PgSQL driver: fix build with PostgreSQL 12+ + +ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped. +--- + src/drivers/postgresql/PostgresqlTypes.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp +index ea576d6..0697129 100644 +--- a/src/drivers/postgresql/PostgresqlTypes.cpp ++++ b/src/drivers/postgresql/PostgresqlTypes.cpp +@@ -36,6 +36,7 @@ + #endif + #include + #include // needed for BOOLOID, etc. ++#include // 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 +-- +cgit v1.1 diff --git a/desktop/kde/applications/kdb/pspec.xml b/desktop/kde/applications/kdb/pspec.xml index 9d052e2b31..75f59be059 100755 --- a/desktop/kde/applications/kdb/pspec.xml +++ b/desktop/kde/applications/kdb/pspec.xml @@ -25,6 +25,9 @@ mariadb-client postgresql-lib + + kdb-3.2.0-build-w-pg12.patch +