diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-13 02:48:49 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-12 14:18:07 +0100 |
commit | f1c14f509a934577cff01732f4f897649ee820fe (patch) | |
tree | 293bdd0c3de7981728d970abf13d8bf8926a473b /dev-db/kdb/files | |
parent | app-office/kexi: Port away from kde5.eclass, update HOMEPAGE (diff) | |
download | gentoo-f1c14f509a934577cff01732f4f897649ee820fe.tar.gz gentoo-f1c14f509a934577cff01732f4f897649ee820fe.tar.bz2 gentoo-f1c14f509a934577cff01732f4f897649ee820fe.zip |
dev-db/kdb: Port away from kde5.eclass, add HOMEPAGE, python3_8, py27--
Fix build with PostgreSQL 12
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-db/kdb/files')
-rw-r--r-- | dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch | 35 | ||||
-rw-r--r-- | dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch | 24 |
2 files changed, 59 insertions, 0 deletions
diff --git a/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch new file mode 100644 index 000000000000..5329fae80d83 --- /dev/null +++ b/dev-db/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 <pino@kde.org> +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 <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 +-- +cgit v1.1 diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch new file mode 100644 index 000000000000..4258fdc47453 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch @@ -0,0 +1,24 @@ +From 6bba3130f8968abb2e904bda1e8b59f83dd43bdc Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@kde.org> +Date: Sat, 25 May 2019 06:59:44 +0200 +Subject: cmake: find PostgreSQL 12 + +--- + cmake/modules/FindPostgreSQL.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake +index 8ec30db..74e6f6b 100644 +--- a/cmake/modules/FindPostgreSQL.cmake ++++ b/cmake/modules/FindPostgreSQL.cmake +@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e + set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") + + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} +- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") ++ "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + + # Define additional search paths for root directories. + foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) +-- +cgit v1.1 |