summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 10:18:51 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 10:18:51 +0200
commitafd35d48cef2832a1e5db5169d3d0d84d1345a62 (patch)
treee4e8b2bbc796f97a60c8a21b947c14dcc072755d /dev-qt/qtsql
parentnet-misc/httpie: x86 stable wrt bug #721524 (diff)
downloadgentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.gz
gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.bz2
gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.zip
dev-qt: Drop Qt 5.13.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtsql')
-rw-r--r--dev-qt/qtsql/Manifest1
-rw-r--r--dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch97
-rw-r--r--dev-qt/qtsql/qtsql-5.13.2.ebuild60
3 files changed, 0 insertions, 158 deletions
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index a037cabd5640..62cc41e4432c 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,3 +1,2 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
diff --git a/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch b/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch
deleted file mode 100644
index f41755adff95..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.13.1-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
- schema = stripDelimiters(schema, QSqlDriver::TableName);
- tbl = stripDelimiters(tbl, QSqlDriver::TableName);
-
-- QString stmt = QStringLiteral("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(QStringLiteral("pg_table_is_visible(pg_class.oid)"));
-- else
-- stmt = stmt.arg(QStringLiteral("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.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
deleted file mode 100644
index 4cdae4a99742..000000000000
--- a/dev-qt/qtsql/qtsql-5.13.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 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="arm"
-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}/${PN}-5.13.1-postgresql-12.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
-}