From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch | 52 ------------------- dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch | 35 ------------- dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch | 24 --------- dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch | 25 --------- dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch | 68 ------------------------- 5 files changed, 204 deletions(-) delete mode 100644 dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch delete mode 100644 dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch delete mode 100644 dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch delete mode 100644 dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch delete mode 100644 dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch (limited to 'dev-db/kdb/files') diff --git a/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch b/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch deleted file mode 100644 index c0b8cb8c2009..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 259684d4768f64fe4f0773442cce83dec089720a Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -Date: Mon, 18 Jan 2021 16:37:20 +0100 -Subject: [PATCH] Use non-deprecated KDEInstaUse non-deprecated KDEInstallDirs - variables - -GIT_SILENT ---- - src/CMakeLists.txt | 2 +- - src/drivers/CMakeLists.txt | 2 +- - src/drivers/sqlite/dump/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 78c91e8c..4a392b63 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -250,7 +250,7 @@ if(BUILD_TEST_COVERAGE) - endif() - - # Create a Config.cmake and a ConfigVersion.cmake file and install them --set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${KDB_BASE_NAME}") -+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KDB_BASE_NAME}") - - ecm_setup_version(${PROJECT_VERSION} - VARIABLE_PREFIX KDB -diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt -index 6fd7f14d..fb2005cc 100644 ---- a/src/drivers/CMakeLists.txt -+++ b/src/drivers/CMakeLists.txt -@@ -5,7 +5,7 @@ endif() - - #TODO add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001) - --set(KDB_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/${KDB_BASE_NAME_LOWER}) -+set(KDB_PLUGIN_INSTALL_DIR ${KDE_INSTALL_PLUGINDIR}/${KDB_BASE_NAME_LOWER}) - - # ----------------------- - macro(build_and_install_kdb_driver _name _srcs _extra_libs) -diff --git a/src/drivers/sqlite/dump/CMakeLists.txt b/src/drivers/sqlite/dump/CMakeLists.txt -index cfffb5c6..27093ccb 100644 ---- a/src/drivers/sqlite/dump/CMakeLists.txt -+++ b/src/drivers/sqlite/dump/CMakeLists.txt -@@ -15,4 +15,4 @@ if(WIN32) - PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") - endif() - --install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) --- -2.31.1 - diff --git a/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch deleted file mode 100644 index 5329fae80d83..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 ---- 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 --- -cgit v1.1 diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch deleted file mode 100644 index 4258fdc47453..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/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 diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch deleted file mode 100644 index 83785533fa87..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fb5dafb01ffba27b5868eaeb99816f3e8c1cf91c Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Fri, 22 May 2020 18:59:11 +0200 -Subject: [PATCH] cmake: find PostgreSQL 13 - ---- - 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 74e6f6b4..90db33ba 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/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} -- "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") -+ "13" "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} ) --- -2.31.1 - diff --git a/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch b/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch deleted file mode 100644 index e4a2a2d11463..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3a31ad05fcc7682bf3b65143af99fdb9b2e1e248 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 - -(cherry picked from commit b36d74f13a1421437a725fb74502c993c359392a) ---- - 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; - } --- -2.31.1 - -- cgit v1.2.3