From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 430B6138334 for ; Thu, 4 Oct 2018 21:37:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54FAAE08B0; Thu, 4 Oct 2018 21:37:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E02BE08B0 for ; Thu, 4 Oct 2018 21:37:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58CAF335C2B for ; Thu, 4 Oct 2018 21:36:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B3762C6 for ; Thu, 4 Oct 2018 21:36:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1538689001.3bc81d2a068f2f755a5f2c5b28e839f4e322b125.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/kdb/files/kdb-3.1.0-crashfix.patch dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch dev-db/kdb/kdb-3.1.0-r2.ebuild X-VCS-Directories: dev-db/kdb/ dev-db/kdb/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3bc81d2a068f2f755a5f2c5b28e839f4e322b125 X-VCS-Branch: master Date: Thu, 4 Oct 2018 21:36:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 55a98a4e-285e-4589-a352-86b4fc1fb89b X-Archives-Hash: f58d317b3d83e24e10ff06e70bcf67d3 commit: 3bc81d2a068f2f755a5f2c5b28e839f4e322b125 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 4 21:20:11 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 4 21:36:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc81d2a dev-db/kdb: USE=mysql DEPENDs on dev-db/mysql-connector-c - Switch away from virtual/mysql - Add one runtime fix - Find postgresql-11 Closes: https://bugs.gentoo.org/665834 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 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 ++++++++++++++++++++++ 4 files changed, 137 insertions(+) diff --git a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch new file mode 100644 index 00000000000..dcc114d4991 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch @@ -0,0 +1,29 @@ +From 386375b6dd9841fdb24a56dcd637be38fcb4c175 Mon Sep 17 00:00:00 2001 +From: Jaroslaw Staniek +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 new file mode 100644 index 00000000000..7bf0100d418 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch @@ -0,0 +1,27 @@ +From a00f37b024e1a0888de3266af9acff99e6f21aa2 Mon Sep 17 00:00:00 2001 +From: Jaroslaw Staniek +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 new file mode 100644 index 00000000000..050335a3852 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch @@ -0,0 +1,24 @@ +From 675d51d86b377992aacdb8253cb7c3b8a80474c0 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +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 new file mode 100644 index 00000000000..e39c39e70d8 --- /dev/null +++ b/dev-db/kdb/kdb-3.1.0-r2.ebuild @@ -0,0 +1,57 @@ +# 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 +}