Update kdb to 3.2.0

Changelog:
https://community.kde.org/Kexi/Releases/3.2.0_Changes#Changes_in_KDb
This commit is contained in:
rsadowski 2019-04-21 10:11:42 +00:00
parent ba9d6d4833
commit 3c445d9c52
4 changed files with 70 additions and 9 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2019/03/08 20:00:40 cwen Exp $
# $OpenBSD: Makefile,v 1.4 2019/04/21 10:11:42 rsadowski Exp $
COMMENT = database connectivity and creation framework
VERSION = 3.1.0
VERSION = 3.2.0
DISTNAME = kdb-${VERSION}
REVISION = 0
SHARED_LIBS += KDb3 1.0 # 3.0
SHARED_LIBS += KDb3 1.1 # 3.0
CATEGORIES = databases
@ -25,8 +24,11 @@ MASTER_SITES = ${MASTER_SITE_KDE:=stable/kdb/src/}}
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake \
lang/python \
devel/kf5
MODPY_RUNDEP = No
BUILD_DEPENDS = shells/bash \
devel/gettext-tools \
databases/postgresql,-server
@ -37,7 +39,7 @@ LIB_DEPENDS = devel/kf5/kcoreaddons \
databases/sqlite3 \
textproc/icu4c
CONFIGURE_ARGS = -DBUILD_TESTING:Bool=Yes \
-DBUILD_EXAMPLES:Bool=Yes
CONFIGURE_ARGS += -DBUILD_TESTING=On \
-DBUILD_EXAMPLES=On
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (kdb-3.1.0.tar.xz) = F1ZFoUmuTXWP8nRpAPbqvkc0sr2sTYyViTxlC+T5KfI=
SIZE (kdb-3.1.0.tar.xz) = 543780
SHA256 (kdb-3.2.0.tar.xz) = j4mDvI0UODLcFLwgA7pq8a8naI5HfAx5H9YURUZPIGk=
SIZE (kdb-3.2.0.tar.xz) = 650180

View File

@ -0,0 +1,48 @@
$OpenBSD: patch-autotests_DateTimeTest_cpp,v 1.1 2019/04/21 10:11:42 rsadowski Exp $
Index: autotests/DateTimeTest.cpp
--- autotests/DateTimeTest.cpp.orig
+++ autotests/DateTimeTest.cpp
@@ -36,13 +36,13 @@ void DateTimeTest::testYear()
{
KDbYear year("2020");
QVERIFY(year.isValid());
- QCOMPARE(year.toString(), "2020");
+ QCOMPARE(QString::fromUtf8(year.toString().data()), QString::fromUtf8("2020"));
QCOMPARE(year.toQDateValue(), 2020);
QCOMPARE(year.toIsoValue(), 2020);
QVariant yearVariant = QVariant::fromValue(year);
QVERIFY(yearVariant.isValid());
QCOMPARE(yearVariant.toInt(), 2020);
- QCOMPARE(yearVariant.toString(), "2020");
+ QCOMPARE(yearVariant.toString(), QString::fromUtf8("2020"));
}
void DateTimeTest::testDate()
@@ -50,7 +50,7 @@ void DateTimeTest::testDate()
KDbYear year("2020");
KDbDate date(year, "2", "29");
QVERIFY(date.isValid());
- QCOMPARE(date.toString(), "2020-2-29");
+ QCOMPARE(QString::fromUtf8(date.toString().data()), QString::fromUtf8("2020-2-29"));
QDate qtDate(2020, 2, 29);
QCOMPARE(date.toQDate(), qtDate);
QVariant dateVariant = QVariant::fromValue(date);
@@ -63,7 +63,7 @@ void DateTimeTest::testTime()
{
KDbTime time("1", "15", "20", "789", KDbTime::Period::Pm);
QVERIFY(time.isValid());
- QCOMPARE(time.toString(), "1:15:20.789 PM");
+ QCOMPARE(QString::fromUtf8(time.toString().data()), QString::fromUtf8("1:15:20.789 PM"));
QTime qtTime(13, 15, 20, 789);
QCOMPARE(time.toQTime(), qtTime);
QVariant timeVariant = QVariant::fromValue(time);
@@ -80,7 +80,7 @@ void DateTimeTest::testDateTime()
KDbDateTime dateTime(date, time);
QVERIFY(dateTime.isValid());
- QCOMPARE(dateTime.toString(), "2020-2-29 1:15:20.789 PM");
+ QCOMPARE(QString::fromUtf8(dateTime.toString().data()), QString::fromUtf8("2020-2-29 1:15:20.789 PM"));
QTime qtTime(13, 15, 20, 789);
QDate qtDate(2020, 2, 29);
QDateTime qtDateTime(qtDate, qtTime);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2018/05/21 10:53:10 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.3 2019/04/21 10:11:42 rsadowski Exp $
@conflict koffice-*
@conflict calligra-<3.0.0
@bin bin/kdb3_sqlite3_dump
@ -19,6 +19,8 @@ include/KDb3/KDbConnectionProxy
include/KDb3/KDbConnectionProxy.h
include/KDb3/KDbCursor
include/KDb3/KDbCursor.h
include/KDb3/KDbDateTime
include/KDb3/KDbDateTime.h
include/KDb3/KDbDriver
include/KDb3/KDbDriver.h
include/KDb3/KDbDriverBehavior
@ -159,6 +161,7 @@ share/locale/de/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/de/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/de/LC_MESSAGES/kdb_qt.qm
share/locale/de/LC_MESSAGES/kdb_sqlitedriver_qt.qm
share/locale/en/LC_MESSAGES/kdb_qt.qm
share/locale/en_GB/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/en_GB/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/en_GB/LC_MESSAGES/kdb_qt.qm
@ -191,6 +194,10 @@ share/locale/ja/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/ja/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/ja/LC_MESSAGES/kdb_qt.qm
share/locale/ja/LC_MESSAGES/kdb_sqlitedriver_qt.qm
share/locale/ko/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/ko/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/ko/LC_MESSAGES/kdb_qt.qm
share/locale/ko/LC_MESSAGES/kdb_sqlitedriver_qt.qm
share/locale/lt/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/lt/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/lt/LC_MESSAGES/kdb_qt.qm
@ -199,6 +206,10 @@ share/locale/nl/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/nl/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/nl/LC_MESSAGES/kdb_qt.qm
share/locale/nl/LC_MESSAGES/kdb_sqlitedriver_qt.qm
share/locale/nn/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/nn/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/nn/LC_MESSAGES/kdb_qt.qm
share/locale/nn/LC_MESSAGES/kdb_sqlitedriver_qt.qm
share/locale/pl/LC_MESSAGES/kdb_mysqldriver_qt.qm
share/locale/pl/LC_MESSAGES/kdb_postgresqldriver_qt.qm
share/locale/pl/LC_MESSAGES/kdb_qt.qm