From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-qt/qtsql/Manifest | 5 +- .../qtsql/files/qtsql-5.13.1-postgresql-12.patch | 97 ---------------------- dev-qt/qtsql/qtsql-5.13.2.ebuild | 60 ------------- dev-qt/qtsql/qtsql-5.14.2.ebuild | 2 +- 4 files changed, 2 insertions(+), 162 deletions(-) delete mode 100644 dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch delete mode 100644 dev-qt/qtsql/qtsql-5.13.2.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index 21d1e84b4ac5..3e915cdb4b8e 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,8 +1,5 @@ -AUX qtsql-5.13.1-postgresql-12.patch 4639 BLAKE2B 85edeacc1c2021bf5e6abe9f76d40c1ed64a1cd1c64ccad1b3f39397e87aa9ef14a26c96df471831a53e1f24ee75aa64fed72767de39e488d4f5f0a92540af1f SHA512 7d10071ab49f31971c6f8045e2d0a2d7fc74ed9bab16b0e7dcbde796a3f9ca430b2db9fbe6c3a8217ab8d998abcf29770b7ee4572a524ca1923691a878e13567 -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 -EBUILD qtsql-5.13.2.ebuild 1301 BLAKE2B bce26d1cedce548f319dbf1cb5f78ac02fe12e5880f22b0b6d2a2e490678e5b671a846827d2cfa37ea30e4c89eabb3de6d599fb409c9262392d3e5cccfd04bca SHA512 b6cf3c11bd3071a35dd2f56734e3e17feea408c8925eda3c35556192ec8e189bc3f2a1055e3ae82d47281cd92f5c9b73e1fd974f16776e6d27b19fa7f7c46e71 EBUILD qtsql-5.14.1.ebuild 1237 BLAKE2B 971a72b1d782c93c70b076a7738e6dc2736bc958d6626a4ff23f66e503b7ab6ed4b853cf508f21cb81181b2dd6bc095576a3620c7225a1bc827f16f6db30b43e SHA512 377ead8cc7956b0ab0630d21f776b218078072e490adac114fbf9c496441803d671634c9277d3dec119dd0546211f08138b79d98ee87c8d52ba0359f10d922c7 -EBUILD qtsql-5.14.2.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a +EBUILD qtsql-5.14.2.ebuild 1243 BLAKE2B dc620facd67f743b7b76d8487176a8c53c4ec1cb9549c0de02304c61d64eb45ad358d9bb538e9a486b5a7c16e594fece629c65b028c6a2347fb0c082d14a2cec SHA512 6296749a01ac4095ce83c0875eb0b5066ed0d4023b4e49e3f4b513f5716893a8acea24868646a09b91353a680c7086180b1af2c023ffbdd5e65c2624e1b0310a MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f 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 -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 ---- - 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 -} diff --git a/dev-qt/qtsql/qtsql-5.14.2.ebuild b/dev-qt/qtsql/qtsql-5.14.2.ebuild index 4853177b0b96..38e4f9dfa561 100644 --- a/dev-qt/qtsql/qtsql-5.14.2.ebuild +++ b/dev-qt/qtsql/qtsql-5.14.2.ebuild @@ -9,7 +9,7 @@ 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" + KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" -- cgit v1.2.3