* [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/
@ 2018-10-04 21:36 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-10-04 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 3bc81d2a068f2f755a5f2c5b28e839f4e322b125
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 4 21:20:11 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <staniek@kde.org>
+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 <staniek@kde.org>
+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 <pino@kde.org>
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/
@ 2019-05-19 20:55 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 20:55 UTC (permalink / raw
To: gentoo-commits
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 <staniek@kde.org>
-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 <staniek@kde.org>
-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 <pino@kde.org>
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/
@ 2021-04-20 12:59 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-04-20 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 9b9dbe1352ec5865dd13d2bc4727dc4c4e9a80f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 11:23:34 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 12:58:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9dbe13
dev-db/kdb: Build with Qt 5.15+, find postgresql-13
Use non-deprecated KDEInstallDirs vars.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
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 +++++++++++++++++++++++++
4 files changed, 213 insertions(+)
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 00000000000..c0b8cb8c200
--- /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" <kossebau@kde.org>
+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 00000000000..83785533fa8
--- /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 <pino@kde.org>
+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 00000000000..e4a2a2d1146
--- /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 <nicolas.fella@gmx.de>
+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 00000000000..8adc6d348e0
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/
@ 2022-06-01 10:04 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-06-01 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 82a743d56594b099fef26dafc3a543738ce0cb45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 10:00:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 10:03:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a743d5
dev-db/kdb: EAPI-8, python3.10, GCC-12, backport "3.2.1" fixes
Find PG-14 and -15 too.
Closes: https://bugs.gentoo.org/845627
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-db/kdb/Manifest | 1 +
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-qt-5.15.patch | 68 ----------------------
dev-db/kdb/kdb-3.2.0-r1.ebuild | 11 ++--
.../{kdb-3.2.0-r1.ebuild => kdb-3.2.0-r2.ebuild} | 34 ++++++-----
6 files changed, 25 insertions(+), 176 deletions(-)
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index eb0224c3d904..6290c27eb8c5 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1 +1,2 @@
+DIST kdb-3.2.0-patches.tar.xz 7448 BLAKE2B 924a3ac0db2fedfa6d757dcb96fefc48540d5bee7dd2e1239e0e7eca9765393e3b72b13365a66a8e336a655aa4c8978e800f3baa86b704e85134d0c7281b90d7 SHA512 4fe59f33059dcfe19a26bed93615ce152f321f040daa57a2e6747a397aebbc896cd6c964cd2cb1350762552173ff146e4e51b864aa098ec5ae77e0dd6c6d9a2f
DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
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" <kossebau@kde.org>
-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 <pino@kde.org>
-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 <libpq-fe.h>
- #include <catalog/pg_type.h> // needed for BOOLOID, etc.
-+#include <pg_config.h> // 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-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 <nicolas.fella@gmx.de>
-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
index 672f29b8c9e0..4fe1be128542 100644
--- a/dev-db/kdb/kdb-3.2.0-r1.ebuild
+++ b/dev-db/kdb/kdb-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,8 @@ 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"
+ SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
KEYWORDS="amd64 x86"
fi
@@ -44,11 +45,11 @@ RDEPEND="${DEPEND}"
PATCHES=(
# 3.2 branch
"${FILESDIR}"/${P}-cmake-pg12.patch
- "${FILESDIR}"/${P}-build-w-pg12.patch
+ "${WORKDIR}"/${P}-patches/${P}-build-w-pg12.patch
"${FILESDIR}"/${P}-cmake-pg13.patch
- "${FILESDIR}"/${P}-qt-5.15.patch
+ "${WORKDIR}"/${P}-patches/${P}-qt-5.15.patch
# master
- "${FILESDIR}"/${P}-KDEInstallDirs.patch
+ "${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch
)
pkg_setup() {
diff --git a/dev-db/kdb/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r2.ebuild
similarity index 66%
copy from dev-db/kdb/kdb-3.2.0-r1.ebuild
copy to dev-db/kdb/kdb-3.2.0-r2.ebuild
index 672f29b8c9e0..0832f00c16db 100644
--- a/dev-db/kdb/kdb-3.2.0-r1.ebuild
+++ b/dev-db/kdb/kdb-3.2.0-r2.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="true"
ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
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"
+ SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patches.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
@@ -34,21 +32,25 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
mysql? ( dev-db/mysql-connector-c:= )
postgres? (
- >=dev-qt/qtnetwork-${QTMIN}:5
dev-db/postgresql:*
+ >=dev-qt/qtnetwork-${QTMIN}:5
)
sqlite? ( dev-db/sqlite:3 )
"
RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+"
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
+ "${WORKDIR}"/${P}-patches/${P}-build-w-pg12.patch
+ "${WORKDIR}"/${P}-patches/${P}-qt-5.15.patch
+ "${WORKDIR}"/${P}-patches/${P}-cmake-pg15.patch
+ "${WORKDIR}"/${P}-patches/${P}-Q_REQUIRED_RESULT-placing.patch
+ "${WORKDIR}"/${P}-patches/${P}-gcc12.patch
# master
- "${FILESDIR}"/${P}-KDEInstallDirs.patch
+ "${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/
@ 2022-06-07 11:34 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-06-07 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 6906b497df7a5b437455b070fa098db983e026a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 11:31:31 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 11:31:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6906b497
dev-db/kdb: Drop 3.2.0-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
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/kdb-3.2.0-r1.ebuild | 69 -----------------------------
3 files changed, 118 deletions(-)
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 <pino@kde.org>
-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 <pino@kde.org>
-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/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r1.ebuild
deleted file mode 100644
index 4fe1be128542..000000000000
--- a/dev-db/kdb/kdb-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 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
- https://dev.gentoo.org/~asturm/distfiles/${P}-patches.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
- "${WORKDIR}"/${P}-patches/${P}-build-w-pg12.patch
- "${FILESDIR}"/${P}-cmake-pg13.patch
- "${WORKDIR}"/${P}-patches/${P}-qt-5.15.patch
- # master
- "${WORKDIR}"/${P}-patches/${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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-07 11:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-01 10:04 [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-06-07 11:34 Andreas Sturmlechner
2021-04-20 12:59 Andreas Sturmlechner
2019-05-19 20:55 Andreas Sturmlechner
2018-10-04 21:36 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox