diff --git a/desktop/kde/applications/kdb/files/40cdaea4.patch b/desktop/kde/applications/kdb/files/40cdaea4.patch new file mode 100644 index 0000000000..831720fed8 --- /dev/null +++ b/desktop/kde/applications/kdb/files/40cdaea4.patch @@ -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: [PATCH] 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 ea576d69..0697129e 100644 +--- a/src/drivers/postgresql/PostgresqlTypes.cpp ++++ b/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 +-- +GitLab + diff --git a/desktop/kde/applications/kdb/files/6.patch b/desktop/kde/applications/kdb/files/6.patch new file mode 100644 index 0000000000..0de68b1e5d --- /dev/null +++ b/desktop/kde/applications/kdb/files/6.patch @@ -0,0 +1,33 @@ +From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001 +From: Bhushan Shah +Date: Sun, 13 Dec 2020 19:16:30 +0530 +Subject: [PATCH] include KDEInstallDirs as first thing + +Otherwise ECMGeneratePriFile won't get correct paths and will install +pri file in wrong place and things wanting to use kdb with qmake won't +work. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3219e967..e3f98b43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,12 +13,12 @@ kdb_add_tests(OFF) + kdb_add_examples(OFF) + + # ECM ++include(KDEInstallDirs) + include(ECMGeneratePriFile) + include(ECMInstallIcons) + include(ECMOptionalAddSubdirectory) + include(ECMPoQmTools) + include(ECMSetupVersion) +-include(KDEInstallDirs) + include(KDECMakeSettings NO_POLICY_SCOPE) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(ECMSetupQtPluginMacroNames) +-- +GitLab + diff --git a/desktop/kde/applications/kdb/files/b36d74f1.patch b/desktop/kde/applications/kdb/files/b36d74f1.patch new file mode 100644 index 0000000000..a9a04ad493 --- /dev/null +++ b/desktop/kde/applications/kdb/files/b36d74f1.patch @@ -0,0 +1,67 @@ +From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Mon, 16 Nov 2020 16:41:27 +0100 +Subject: [PATCH] Fix build with newer Qt + +--- + src/KDb.cpp | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/KDb.cpp b/src/KDb.cpp +index 5c3b601f..ee92c2ee 100644 +--- a/src/KDb.cpp ++++ b/src/KDb.cpp +@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type) + for (int i = 0; i < size; i++) { + const unsigned char val = array[i]; + if (val < 32 || val >= 127 || val == 39 || val == 92) { +- str[new_length++] = '\\'; +- str[new_length++] = '\\'; +- str[new_length++] = '0' + val / 64; +- str[new_length++] = '0' + (val % 64) / 8; +- str[new_length++] = '0' + val % 8; ++ str[new_length++] = QLatin1Char('\\'); ++ str[new_length++] = QLatin1Char('\\'); ++ str[new_length++] = QChar::fromLatin1('0' + val / 64); ++ str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8); ++ str[new_length++] = QChar::fromLatin1('0' + val % 8); + } else { +- str[new_length++] = val; ++ str[new_length++] = QChar::fromLatin1(val); + } + } + } else { + for (int i = 0; i < size; i++) { + const unsigned char val = array[i]; +- str[new_length++] = intToHexDigit(val / 16); +- str[new_length++] = intToHexDigit(val % 16); ++ str[new_length++] = QChar::fromLatin1(intToHexDigit(val / 16)); ++ str[new_length++] = QChar::fromLatin1(intToHexDigit(val % 16)); + } + } + if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) { +- str[new_length++] = '\''; ++ str[new_length++] = QLatin1Char('\''); + } else if (type == BLOBEscapingType::ByteaHex) { +- str[new_length++] = '\''; +- str[new_length++] = ':'; +- str[new_length++] = ':'; +- str[new_length++] = 'b'; +- str[new_length++] = 'y'; +- str[new_length++] = 't'; +- str[new_length++] = 'e'; +- str[new_length++] = 'a'; ++ str[new_length++] = QLatin1Char('\''); ++ str[new_length++] = QLatin1Char(':'); ++ str[new_length++] = QLatin1Char(':'); ++ str[new_length++] = QLatin1Char('b'); ++ str[new_length++] = QLatin1Char('y'); ++ str[new_length++] = QLatin1Char('t'); ++ str[new_length++] = QLatin1Char('e'); ++ str[new_length++] = QLatin1Char('a'); + } + return str; + } +-- +GitLab + diff --git a/desktop/kde/applications/kdb/pspec.xml b/desktop/kde/applications/kdb/pspec.xml index cd2fd9ecec..53f3441d14 100755 --- a/desktop/kde/applications/kdb/pspec.xml +++ b/desktop/kde/applications/kdb/pspec.xml @@ -17,19 +17,23 @@ extra-cmake-modules qt5-base-devel qt5-linguist - kcoreaddons-devel + kcoreaddons5-devel icu4c-devel - ki18n-devel + ki18n5-devel sqlite-devel mariadb-lib mariadb-client postgresql-lib - kdb-3.2.0-build-w-pg12.patch + 40cdaea4.patch + 6.patch + b36d74f1.patch + + kdb-3.2.0-cmake-pg12.patch kdb-3.2.0-cmake-pg13.patch - kdb-3.2.0-qt-5.15.patch + kdb-3.2.0-KDEInstallDirs.patch @@ -42,7 +46,7 @@ libgcc sqlite qt5-base - kcoreaddons + kcoreaddons5 mariadb-lib postgresql-lib @@ -68,279 +72,13 @@ - - 2023-12-07 + + 2025-01-26 3.2.0 Rebuild. Mustafa Cinasl muscnsl@gmail.com - - 2023-10-27 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-09-14 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-06-08 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-05-11 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-04-20 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-03-03 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2023-01-05 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-12-08 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-11-05 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-09-24 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-06-21 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-05-17 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-05-07 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2022-01-10 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2021-10-15 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2021-09-13 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2021-06-16 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2021-03-10 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2020-09-12 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2020-06-11 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2020-05-06 - 3.2.0 - Rebuild. - Mustafa Cinasl - muscnsl@gmail.com - - - 2020-03-30 - 3.2.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2020-02-02 - 3.2.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-09-15 - 3.2.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-07-22 - 3.2.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-04-18 - 3.2.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-03-11 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-02-14 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2019-01-11 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2018-12-26 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2018-11-08 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2018-10-18 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2018-09-10 - 3.1.0 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2018-08-11 - 3.0.2 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-02-03 - 3.0.2 - Rebuild - Mustafa Cinasl - muscnsl@gmail.com - - - 2017-10-14 - 3.0.2 - Version bump - Mustafa Cinasl - muscnsl@gmail.com - - - 2017-07-17 - 3.0.93 - Version bump - Ali Algul - aligulle3801@gmail.com - - - 2017-06-30 - 3.0.1 - Version bump. - Kamil Atlı - suvari@pisilinux.org - 2017-01-06 3.0.0