Hello community, here is the log from the commit of package kdb for openSUSE:Leap:15.2 checked in at 2020-03-17 04:15:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kdb (Old) and /work/SRC/openSUSE:Leap:15.2/.kdb.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdb" Tue Mar 17 04:15:45 2020 rev:18 rq:785741 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kdb/kdb.changes 2020-01-15 15:15:05.158230786 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kdb.new.3160/kdb.changes 2020-03-17 04:16:12.728996439 +0100 @@ -1,0 +2,16 @@ +Mon Mar 16 04:01:16 UTC 2020 - Max Lin <m...@suse.com> + +- BuildRequires postgresql-server-devel on Leap version >= 15.2 + +------------------------------------------------------------------- +Thu Jan 30 13:44:41 UTC 2020 - wba...@tmo.at + +- Add Fix-build-with-PostgreSQL-12.patch to fix build in Tumbleweed + +------------------------------------------------------------------- +Sat Aug 24 08:49:26 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Remove the pkg-config file from the -devel package. KDb3.pc contains + incorrect entries. + +------------------------------------------------------------------- New: ---- Fix-build-with-PostgreSQL-12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdb.spec ++++++ --- /var/tmp/diff_new_pack.4sIe7d/_old 2020-03-17 04:16:13.956997151 +0100 +++ /var/tmp/diff_new_pack.4sIe7d/_new 2020-03-17 04:16:13.992997172 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdb # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,20 +25,22 @@ 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: kcoreaddons-devel BuildRequires: libicu-devel BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: pkgconfig BuildRequires: python-base BuildRequires: sqlite3-devel +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -%if 0%{?suse_version} > 1500 +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 BuildRequires: postgresql-server-devel %else BuildRequires: postgresql-devel @@ -100,6 +102,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build @@ -109,6 +112,9 @@ %kf5_makeinstall -C build %find_lang %{name} %{name}.lang --all-name --with-qt + # Contains bogus entries + rm -f %{buildroot}%{_libdir}/pkgconfig/KDb3.pc + %post -n libKDb3-%{sover} -p /sbin/ldconfig %postun -n libKDb3-%{sover} -p /sbin/ldconfig @@ -120,7 +126,7 @@ %license COPYING* %{_includedir}/KDb3/ %{_libdir}/cmake/KDb3/ -%{_libdir}/pkgconfig/KDb3.pc +#%%{_libdir}/pkgconfig/KDb3.pc %{_kf5_mkspecsdir}/qt_KDb3.pri %{_libdir}/libKDb3.so ++++++ 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
