From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-db/kdb/Manifest | 4 ++ dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch | 52 +++++++++++++++++++ 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 +++++++++++++++++++++++++ dev-db/kdb/kdb-3.2.0-r1.ebuild | 68 +++++++++++++++++++++++++ 5 files changed, 217 insertions(+) create mode 100644 dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch create mode 100644 dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch create mode 100644 dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch create mode 100644 dev-db/kdb/kdb-3.2.0-r1.ebuild (limited to 'dev-db/kdb') diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest index a3fea44a76ab..d098082c9f23 100644 --- a/dev-db/kdb/Manifest +++ b/dev-db/kdb/Manifest @@ -1,5 +1,9 @@ +AUX kdb-3.2.0-KDEInstallDirs.patch 1926 BLAKE2B 2355a2cbcc2306a1a13aed6949502792c4d7041b1d3f22daf030e73123913ec7c0fb361fc848724d35eaf11ccebb5bbbada5980f8bce631b7f667ab4dde80100 SHA512 4f136a83ea3a1551855ec4b3f29ad1877ddb871887fa55ad0f99cf4226028c436736342d4d8affc49d448fe96101e6970856c884eb59bab309281ed77c3a54bb AUX kdb-3.2.0-build-w-pg12.patch 1372 BLAKE2B 7db0095bfa7f1071dad6f58ee958f4501a1e14f8ca74fb504b2757892a9ff0daff9641b23d24d7b1e30c584d4afaa2958f069196503de18f0766e46328259f6b SHA512 0b89bec94bf4649dee63937d0dc3627f50d7afe65ceb4ea5efbceae05b92dc033c4ee72cfe210f949ad508f15befbad66459eb9ee7d50552f2b8cd675d753743 AUX kdb-3.2.0-cmake-pg12.patch 1094 BLAKE2B 4857bcef303533fdb57bf3d19b8881f872f3ae75a7519a6b7b9dea6ff5d4801c9be3b5850ef17af2695baf493cbc3fa0b110775e8914d0ec217a786aac406bac SHA512 d380ec8f779349fc854cf09d5098d1f8548572bca8001771db3f74560bce13575fee087515b7b28925d6eddbcad36fd98255009c4ae39f5c4d01d8c3ba44d06d +AUX kdb-3.2.0-cmake-pg13.patch 1112 BLAKE2B 985e25a891dc4b6b8a6c56c0ba4cd93c8af71dd0b4b9c256dbb63014825f9ad9ee17ebd7521679d2105ded9240c1881d94f516f94ee89cb2317bc6fe8a57c85a SHA512 78e2d8d44836e62eceffffaef408976c5f7f9e239643568018d51dec30dfc766a1a985e972ad26c6f375a1fdcd8797e48b68a8c8710e16350ddf38d3ae03dc28 +AUX kdb-3.2.0-qt-5.15.patch 2768 BLAKE2B 74d3f894dfac6caa3bb2b5fab0cb20b6190d3e0341f8b495141f3f6c2d4941faa88859799daeb7c6da680afda3ea2239eea2626f5fc3f2a355b22372b7f684f1 SHA512 5c21da612fa5925734bd8f298059f547dc91ce516232c4c5e7a41ccedff90b641c21da761f5f94f0660d107ebc56fdca191b059b282c8c593e57d4a295c63cf4 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7 +EBUILD kdb-3.2.0-r1.ebuild 1454 BLAKE2B 04df6f8871c98f162fc32318cb62dea0a869c23e469f3885cec9431f27661f48e62a2b78f73122df40c94af5f6e7bb002e5b4a2b3e5e7144fa99a76b156a9ec4 SHA512 db0b55ecd1ef223589b343fe2fd80c14551e1c6fd9e1c3b0d9670fbaf7326475ba5505568c599d148467c7dce3ea4133245da76372d3b0fbc8cf9aa9c20b05b5 EBUILD kdb-3.2.0.ebuild 1316 BLAKE2B bff6fb7ad77e5c7cc0a3081abc25d88560ea770f430598b6bd5b66a3a0dee4f61930383f23da24cdd2fc1ca28c307583d9027d733d8355ef7daee5ea975b89d6 SHA512 e0f105d9031836512b7a2caf81b69235445f631539e18c7711fe1bfdabbb8a52b76434a29205fb957be21f9bbd68b01426903b4f9454b8b166b3c8521a73d5bb MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch b/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch new file mode 100644 index 000000000000..c0b8cb8c2009 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch @@ -0,0 +1,52 @@ +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-cmake-pg13.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch new file mode 100644 index 000000000000..83785533fa87 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 000000000000..e4a2a2d11463 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch @@ -0,0 +1,68 @@ +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 + diff --git a/dev-db/kdb/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r1.ebuild new file mode 100644 index 000000000000..8adc6d348e00 --- /dev/null +++ b/dev-db/kdb/kdb-3.2.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_QTHELP="true" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{7,8,9} ) +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org python-any-r1 + +DESCRIPTION="Database connectivity and creation framework for various vendors" +HOMEPAGE="https://community.kde.org/KDb" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2+" +SLOT="5/4" +IUSE="debug mysql postgres sqlite" + +BDEPEND="${PYTHON_DEPS} + dev-qt/linguist-tools:5 +" +DEPEND=" + dev-libs/icu:= + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( + >=dev-qt/qtnetwork-${QTMIN}:5 + dev-db/postgresql:* + ) + sqlite? ( dev-db/sqlite:3 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + # 3.2 branch + "${FILESDIR}"/${P}-cmake-pg12.patch + "${FILESDIR}"/${P}-build-w-pg12.patch + "${FILESDIR}"/${P}-cmake-pg13.patch + "${FILESDIR}"/${P}-qt-5.15.patch + # master + "${FILESDIR}"/${P}-KDEInstallDirs.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + ecm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DKDB_DEBUG_GUI=$(usex debug) + $(cmake_use_find_package mysql MySQL) + $(cmake_use_find_package postgres PostgreSQL) + $(cmake_use_find_package sqlite Sqlite) + ) + + ecm_src_configure +} -- cgit v1.2.3