commit: 0db3b3f478f66c0599e4808a3096b60824bbee6a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun May 19 20:50:58 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 19 20:55:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db3b3f4
dev-db/kdb: Drop 3.1.0 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-db/kdb/Manifest | 1 - dev-db/kdb/files/kdb-3.1.0-crashfix.patch | 29 ----------- .../kdb/files/kdb-3.1.0-fix-loading-objdata.patch | 27 ---------- dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch | 24 --------- dev-db/kdb/kdb-3.1.0-r2.ebuild | 57 ---------------------- 5 files changed, 138 deletions(-) diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest index 78a60853558..eb0224c3d90 100644 --- a/dev-db/kdb/Manifest +++ b/dev-db/kdb/Manifest @@ -1,2 +1 @@ -DIST kdb-3.1.0.tar.xz 543780 BLAKE2B d874765758e245fc939bf88312b064d2dcff3460b2c9e968277e0ce7b8821314273cb3086e821645f9d7605de1a4268e25d11c40f8bf847a8dc98c410bd4d9eb SHA512 f94f1ff87cb5133570f7e9b0ab48202a516eabe1c3f2ed750cd1794800d9b9936bbd62e1479ca6877c293f6473b7f4e2d4a144b928b5bc0f228af327131b43c2 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7 diff --git a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch deleted file mode 100644 index dcc114d4991..00000000000 --- a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 386375b6dd9841fdb24a56dcd637be38fcb4c175 Mon Sep 17 00:00:00 2001 -From: Jaroslaw Staniek <[email protected]> -Date: Tue, 27 Mar 2018 00:20:34 +0200 -Subject: Fix crash in KDbConnection::recordCount(KDbTableSchema) - -FIXED-IN:3.1.1 ---- - src/KDbConnection.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp -index e53bb33..d416d12 100644 ---- a/src/KDbConnection.cpp -+++ b/src/KDbConnection.cpp -@@ -3420,10 +3420,8 @@ int KDbConnection::recordCount(const KDbTableSchema& tableSchema) - { - //! @todo does not work with non-SQL data sources - int count = -1; // will be changed only on success of querySingleNumber() -- const tristate result -- = querySingleNumber(KDbEscapedString("SELECT COUNT(*) FROM ") -- + tableSchema.connection()->escapeIdentifier(tableSchema.name()), -- &count); -+ const tristate result = querySingleNumber( -+ KDbEscapedString("SELECT COUNT(*) FROM ") + escapeIdentifier(tableSchema.name()), &count); - if (~result) { - count = 0; - } --- -cgit v0.11.2 diff --git a/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch b/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch deleted file mode 100644 index 7bf0100d418..00000000000 --- a/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a00f37b024e1a0888de3266af9acff99e6f21aa2 Mon Sep 17 00:00:00 2001 -From: Jaroslaw Staniek <[email protected]> -Date: Tue, 1 May 2018 23:29:06 +0200 -Subject: Fix loading object data for given type and ID - -FIXED-IN:3.1.1 - -CCBUG:393705 ---- - src/KDbConnection.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp -index d416d12..690752d 100644 ---- a/src/KDbConnection.cpp -+++ b/src/KDbConnection.cpp -@@ -2188,7 +2188,7 @@ tristate KDbConnection::loadObjectData(int type, int id, KDbObject* object) - } - } else { - if (true != querySingleRecord(KDbEscapedString("SELECT o_id, o_type, o_name, o_caption, o_desc " -- "FROM kexi__objects WHERE o_type=%1 AND o_id=%1") -+ "FROM kexi__objects WHERE o_type=%1 AND o_id=%2") - .arg(d->driver->valueToSql(KDbField::Integer, type)) - .arg(d->driver->valueToSql(KDbField::Integer, id)), - &data)) --- -cgit v0.11.2 diff --git a/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch b/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch deleted file mode 100644 index 050335a3852..00000000000 --- a/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 675d51d86b377992aacdb8253cb7c3b8a80474c0 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <[email protected]> -Date: Tue, 22 May 2018 18:37:53 +0200 -Subject: cmake: find PostgreSQL 11 - ---- - 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 039c380..56e6e56 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} -- "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") -+ "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 v0.11.2 diff --git a/dev-db/kdb/kdb-3.1.0-r2.ebuild b/dev-db/kdb/kdb-3.1.0-r2.ebuild deleted file mode 100644 index 0ce2b2aa7e9..00000000000 --- a/dev-db/kdb/kdb-3.1.0-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit kde5 python-any-r1 - -DESCRIPTION="Database connectivity and creation framework for various vendors" -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="5/4" -KEYWORDS="amd64 x86" -IUSE="debug mysql postgres sqlite" - -RDEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/icu:= - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( - $(add_qt_dep qtnetwork) - dev-db/postgresql:* - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-qt/linguist-tools:5 -" - -PATCHES=( - "${FILESDIR}/${P}-crashfix.patch" - "${FILESDIR}/${P}-fix-loading-objdata.patch" - "${FILESDIR}/${P}-postgresql-11.patch" -) - -pkg_setup() { - python-any-r1_pkg_setup - kde5_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DKDB_DEBUG_GUI=$(usex debug) - $(cmake-utils_use_find_package mysql MySQL) - $(cmake-utils_use_find_package postgres PostgreSQL) - $(cmake-utils_use_find_package sqlite Sqlite) - ) - - kde5_src_configure -}
