dev-qt: Drop 5.12.5

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 0 insertions, 263 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index bf3fa3b20939..3bd9a1af3a0f 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,4 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
diff --git a/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch b/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch
deleted file mode 100644
index 6bd3d3d2b9bd..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 97d8be10cd97cf997286ed0ca0a5d8b360fa942e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Sat, 1 Dec 2018 17:56:41 +0100
-Subject: [PATCH] MySQL: Free the results when QSqlQuery::finished() is called
-
-Calling mysql_stmt_free_result() frees the results of the last
-executed query while keeping the prepared statement valid. This
-allows one to keep around prepared QSqlQueries without the overhead
-of keeping all the results in memory.
-
-Change-Id: I4589e90857cc4e9a6f9612799bfca967a67e2ab2
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/plugins/sqldrivers/mysql/qsql_mysql.cpp |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-@@ -197,6 +197,7 @@ protected:
-     QSqlRecord record() const override;
-     void virtual_hook(int id, void *data) override;
-     bool nextResult() override;
-+    void detachFromResultSet() override;
- 
- #if MYSQL_VERSION_ID >= 40108
-     bool prepare(const QString &stmt) override;
-@@ -804,6 +805,15 @@ int QMYSQLResult::numRowsAffected()
-     return d->rowsAffected;
- }
- 
-+void QMYSQLResult::detachFromResultSet()
-+{
-+    Q_D(QMYSQLResult);
-+
-+    if (d->preparedQuery) {
-+        mysql_stmt_free_result(d->stmt);
-+    }
-+}
-+
- QVariant QMYSQLResult::lastInsertId() const
- {
-     Q_D(const QMYSQLResult);
diff --git a/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch b/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch
deleted file mode 100644
index 7e344389e5dd..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 14b61d48e8bad6223a08843cf363ef48f09c479b Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Fri, 11 Oct 2019 20:53:49 +0200
-Subject: [PATCH] QPSQL: Add support for PostgreSQL 12
-
-Add proper version check and replace long deprecated and now removed
-access to pg_attrdef.adsrc.
-
-[ChangeLog][QtSql][QPSQL] added support for PostgreSQL 12
-
-Fixes: QTBUG-79033
-Fixes: QTBUG-79064
-Change-Id: Iec1b13945c34ea017139ad1c5539ab5b7f1e03aa
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
----
- src/plugins/sqldrivers/psql/qsql_psql.cpp | 43 +++++++++++++++++--------------
- src/plugins/sqldrivers/psql/qsql_psql_p.h |  1 +
- 2 files changed, 25 insertions(+), 19 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
-index 3803f05b9f9..760685f64b4 100644
---- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
-+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
-@@ -1078,8 +1078,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
-         return QPSQLDriver::Version10;
-     case 11:
-         return QPSQLDriver::Version11;
-+    case 12:
-+        return QPSQLDriver::Version12;
-     default:
--        if (vMaj > 11)
-+        if (vMaj > 12)
-             return QPSQLDriver::UnknownLaterVersion;
-         break;
-     }
-@@ -1439,26 +1441,29 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const
-     else
-         schema = std::move(schema).toLower();
- 
--    QString stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
--                                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
--                                 "pg_attrdef.adsrc "
--                                 "from pg_class, pg_attribute "
--                                 "left join pg_attrdef on (pg_attrdef.adrelid = "
--                                 "pg_attribute.attrelid and pg_attrdef.adnum = pg_attribute.attnum) "
--                                 "where %1 "
--                                 "and pg_class.relname = '%2' "
--                                 "and pg_attribute.attnum > 0 "
--                                 "and pg_attribute.attrelid = pg_class.oid "
--                                 "and pg_attribute.attisdropped = false "
--                                 "order by pg_attribute.attnum");
--    if (schema.isEmpty())
--        stmt = stmt.arg(QLatin1String("pg_table_is_visible(pg_class.oid)"));
--    else
--        stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
--                                            "pg_namespace where pg_namespace.nspname = '%1')").arg(schema));
-+    const QString adsrc = protocol() < Version8
-+        ? QStringLiteral("pg_attrdef.adsrc")
-+        : QStringLiteral("pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid)");
-+    const QString nspname = schema.isEmpty()
-+        ? QStringLiteral("pg_table_is_visible(pg_class.oid)")
-+        : QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
-+                         "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema);
-+    const QString stmt =
-+        QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-+                       "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-+                       "%1 "
-+                       "FROM pg_class, pg_attribute "
-+                       "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
-+                       "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
-+                       "WHERE %2 "
-+                       "AND pg_class.relname = '%3' "
-+                       "AND pg_attribute.attnum > 0 "
-+                       "AND pg_attribute.attrelid = pg_class.oid "
-+                       "AND pg_attribute.attisdropped = false "
-+                       "ORDER BY pg_attribute.attnum").arg(adsrc, nspname, tbl);
- 
-     QSqlQuery query(createResult());
--    query.exec(stmt.arg(tbl));
-+    query.exec(stmt);
-     while (query.next()) {
-         int len = query.value(3).toInt();
-         int precision = query.value(4).toInt();
-diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
-index 99e0b5f60f5..9ac1fb50d79 100644
---- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
-+++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
-@@ -93,6 +93,7 @@ public:
-         Version9_6 = 22,
-         Version10 = 23,
-         Version11 = 24,
-+        Version12 = 25,
-         UnknownLaterVersion = 100000
-     };
- 
--- 
-2.16.3
diff --git a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild
deleted file mode 100644
index ba8810e497a0..000000000000
--- a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-PATCHES+=(
-	# Backport from dev branch
-	"${FILESDIR}/${PN}-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild
deleted file mode 100644
index 48eb0930db10..000000000000
--- a/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-PATCHES+=(
-	# Backport from 5.14 branch, bug #696870
-	"${FILESDIR}/${P}-postgresql-12.patch"
-	# Backport from dev branch
-	"${FILESDIR}/${PN}-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}