Hello community, here is the log from the commit of package kdb for openSUSE:Factory checked in at 2020-01-31 23:56:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdb (Old) and /work/SRC/openSUSE:Factory/.kdb.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdb" Fri Jan 31 23:56:46 2020 rev:10 rq:768765 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdb/kdb.changes 2019-08-24 18:50:01.841736306 +0200 +++ /work/SRC/openSUSE:Factory/.kdb.new.26092/kdb.changes 2020-01-31 23:57:53.391670218 +0100 @@ -1,0 +2,5 @@ +Thu Jan 30 13:44:41 UTC 2020 - wba...@tmo.at + +- Add Fix-build-with-PostgreSQL-12.patch to fix build in Tumbleweed + +------------------------------------------------------------------- New: ---- Fix-build-with-PostgreSQL-12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdb.spec ++++++ --- /var/tmp/diff_new_pack.a2jRp1/_old 2020-01-31 23:57:54.183670628 +0100 +++ /var/tmp/diff_new_pack.a2jRp1/_new 2020-01-31 23:57:54.187670630 +0100 @@ -25,6 +25,8 @@ Group: Productivity/Office/Other URL: https://community.kde.org/KDb Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-build-with-PostgreSQL-12.patch BuildRequires: extra-cmake-modules BuildRequires: libicu-devel BuildRequires: libmysqlclient-devel @@ -100,6 +102,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build ++++++ Fix-build-with-PostgreSQL-12.patch ++++++ >From 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911 Mon Sep 17 00:00:00 2001 From: Pino Toscano <p...@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
