Index: branches/2019Q4/databases/kdb/Makefile =================================================================== --- branches/2019Q4/databases/kdb/Makefile (revision 517869) +++ branches/2019Q4/databases/kdb/Makefile (revision 517870) @@ -1,33 +1,33 @@ # $FreeBSD$ PORTNAME= kdb DISTVERSION= 3.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Database connectivity and creation framework LIB_DEPENDS= libicuuc.so:devel/icu USES= cmake compiler:c++11-lang gettext kde:5 \ python:2.7 qt:5 tar:xz USE_KDE= coreaddons ecm i18n USE_QT= core gui network widgets xml \ buildtools_build qmake_build # In the future, these options will be moved into slave ports OPTIONS_DEFINE= SQLITE MYSQL PGSQL OPTIONS_SUB= YES OPTIONS_DEFAULT= ${OPTIONS_DEFINE} SQLITE_USES= sqlite SQLITE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Sqlite MYSQL_USES= mysql MYSQL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_MySQL PGSQL_USES= pgsql PGSQL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL .include Index: branches/2019Q4/databases/kdb/files/patch-cgit40cdaea =================================================================== --- branches/2019Q4/databases/kdb/files/patch-cgit40cdaea (nonexistent) +++ branches/2019Q4/databases/kdb/files/patch-cgit40cdaea (revision 517870) @@ -0,0 +1,36 @@ +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 +--- ./src/drivers/postgresql/PostgresqlTypes.cpp ++++ ./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 + Property changes on: branches/2019Q4/databases/kdb/files/patch-cgit40cdaea ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4/databases/kdb/files/patch-cgit6bba313 =================================================================== --- branches/2019Q4/databases/kdb/files/patch-cgit6bba313 (nonexistent) +++ branches/2019Q4/databases/kdb/files/patch-cgit6bba313 (revision 517870) @@ -0,0 +1,25 @@ +From 6bba3130f8968abb2e904bda1e8b59f83dd43bdc Mon Sep 17 00:00:00 2001 +From: Pino Toscano +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 +--- ./cmake/modules/FindPostgreSQL.cmake ++++ ./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 + Property changes on: branches/2019Q4/databases/kdb/files/patch-cgit6bba313 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4/databases/kdb/files/patch-cgitd2b17a8 =================================================================== --- branches/2019Q4/databases/kdb/files/patch-cgitd2b17a8 (nonexistent) +++ branches/2019Q4/databases/kdb/files/patch-cgitd2b17a8 (revision 517870) @@ -0,0 +1,65 @@ +From d2b17a8aeada96df3304725cd532c76a94ce3cc4 Mon Sep 17 00:00:00 2001 +From: Jaroslaw Staniek +Date: Tue, 29 Oct 2019 22:47:56 +0100 +Subject: Autotests: Fix QCOMPARE for QString,const char* and QByteArrya,const + char * + +FIXED-IN:3.2.1 +--- + autotests/DateTimeTest.cpp | 1 + + autotests/KDbTestUtils.cpp | 10 ++++++++++ + autotests/KDbTestUtils.h | 5 +++++ + 3 files changed, 16 insertions(+) + +diff --git a/autotests/DateTimeTest.cpp b/autotests/DateTimeTest.cpp +index ed655ca..bb32771 100644 +--- ./autotests/DateTimeTest.cpp ++++ ./autotests/DateTimeTest.cpp +@@ -18,6 +18,7 @@ + */ + + #include "DateTimeTest.h" ++#include "KDbTestUtils.h" + + #include + +diff --git a/autotests/KDbTestUtils.cpp b/autotests/KDbTestUtils.cpp +index 494670a..3c35816 100644 +--- ./autotests/KDbTestUtils.cpp ++++ ./autotests/KDbTestUtils.cpp +@@ -110,6 +110,16 @@ KDBTESTUTILS_EXPORT bool qCompare(const QStringList &val1, const QStringList &va + : compare_helper(false, "Compared values are not the same", toString(val1), + toString(val2), actual, expected, file, line); + } ++KDBTESTUTILS_EXPORT bool qCompare(const QByteArray &val1, const char *val2, const char *actual, ++ const char *expected, const char *file, int line) ++{ ++ return qCompare(val1, QByteArray(val2), actual, expected, file, line); ++} ++KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const char *val2, const char *actual, ++ const char *expected, const char *file, int line) ++{ ++ return qCompare(val1, QString::fromLatin1(val2), actual, expected, file, line); ++} + } + + class KDbTestUtils::Private { +diff --git a/autotests/KDbTestUtils.h b/autotests/KDbTestUtils.h +index 0462e95..9094f17 100644 +--- ./autotests/KDbTestUtils.h ++++ ./autotests/KDbTestUtils.h +@@ -79,6 +79,11 @@ KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const KDbEscapedString &v + KDBTESTUTILS_EXPORT bool qCompare(const QStringList &val1, const QStringList &val2, + const char *actual, const char *expected, const char *file, + int line); ++ ++KDBTESTUTILS_EXPORT bool qCompare(const QByteArray &val1, const char *val2, const char *actual, ++ const char *expected, const char *file, int line); ++KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const char *val2, const char *actual, ++ const char *expected, const char *file, int line); + } + + //! Calls @a call and verifies status of @a resultable +-- +cgit v1.1 + Property changes on: branches/2019Q4/databases/kdb/files/patch-cgitd2b17a8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 517869) +++ branches/2019Q4 (revision 517870) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r517854