commit: 031de6c14afdc66613f5d38dde6677f12da3c8ef
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 22 13:58:59 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 14:02:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031de6c1
dev-db/qt5-sqlcipher: drop 1.0.11-r2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 1 -
.../files/qt5-sqlcipher-1.0.10-install-path.patch | 15 ----
.../files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch | 92 ----------------------
.../qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild | 48 -----------
4 files changed, 156 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index dde31f4e6855..3282dda78474 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,2 +1 @@
-DIST qt5-sqlcipher-1.0.11.tar.gz 267993 BLAKE2B
e938f7de368af90cb3304eeb79afcc86354bcecd55e57b7fb73c979e5e40dbf1b0936db37c16b8e9cc3ca4646aac5cd773917eff14735f2eaf91ac67d9432d66
SHA512
6ed4bd6fa7155438266cae2ecaeaea648e9b55df23f7fb811daa7d90fda0ab36e489c28b3739a4cc1103fc5f550e16f9a58f9df4e001e72ac10937bc2115bad9
DIST qt5-sqlcipher-1.1.0.tar.gz 683201 BLAKE2B
c49536398bcf196401fa5889a6a35daa656eb6f63faeef223ded3f15dd64fcaa9d87a69c2ea1f0c1f6a9503a810e23cad5bc86ebcacc2ce1b65a222ec46d9be5
SHA512
6f86a51f71515d4863f17808d794f0162a70043a5cca09fcb0f76cb7a8be84f231fe9866663829cfbd610da7584a0c9a0f4f830356ac56467d1d5e68ede9400f
diff --git a/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch
b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch
deleted file mode 100644
index e6869e6f3d5b..000000000000
--- a/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- qt5-sqlcipher-1.0.10-orig/CMakeLists.txt
-+++ qt5-sqlcipher-1.0.10/CMakeLists.txt
-@@ -196,11 +196,7 @@
- INSTALL(TARGETS qsqlcipher-test DESTINATION bin)
- endif()
- else()
-- message(WARNING "Packaging is not set up for this platform,
either submit a ticket or change/add pathes yourself, if packaging is
required.")
-- INSTALL(TARGETS qsqlcipher DESTINATION sqldrivers)
-- if (QSQLCIPHER_BUILD_TESTS)
-- INSTALL(TARGETS qsqlcipher-test DESTINATION bin)
-- endif()
-+ INSTALL(TARGETS qsqlcipher DESTINATION
@LIBDIR@/qt5/plugins/sqldrivers)
- endif()
- else()
- INSTALL(TARGETS qsqlcipher DESTINATION sqldrivers)
diff --git a/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch
b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch
deleted file mode 100644
index 24277405fdbb..000000000000
--- a/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- qt5-sqlcipher-1.0.11/qt-file-cache/5.15.16/qsql_sqlite.cpp
-+++ qt5-sqlcipher-1.0.11/qt-file-cache/5.15.16/qsql_sqlite.cpp
-@@ -74,13 +74,18 @@
-
- QT_BEGIN_NAMESPACE
-
--static QString _q_escapeIdentifier(const QString &identifier)
-+static QString _q_escapeIdentifier(const QString &identifier,
QSqlDriver::IdentifierType type)
- {
- QString res = identifier;
-+ // If it contains [ and ] then we assume it to be escaped properly
already as this indicates
-+ // the syntax is exactly how it should be
-+ if (identifier.contains(QLatin1Char('[')) &&
identifier.contains(QLatin1Char(']')))
-+ return res;
- if (!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) &&
!identifier.endsWith(QLatin1Char('"'))) {
- res.replace(QLatin1Char('"'), QLatin1String("\"\""));
- res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
-- res.replace(QLatin1Char('.'), QLatin1String("\".\""));
-+ if (type == QSqlDriver::TableName)
-+ res.replace(QLatin1Char('.'), QLatin1String("\".\""));
- }
- return res;
- }
-@@ -478,7 +483,12 @@
- for (int i = 0, currentIndex = 0; i < values.size(); ++i) {
- if (handledIndexes.contains(i))
- continue;
-- const auto placeHolder =
QString::fromUtf8(sqlite3_bind_parameter_name(d->stmt, currentIndex + 1));
-+ const char *parameterName = sqlite3_bind_parameter_name(d->stmt,
currentIndex + 1);
-+ if (!parameterName) {
-+ paramCountIsValid = false;
-+ continue;
-+ }
-+ const auto placeHolder = QString::fromUtf8(parameterName);
- const auto &indexes = d->indexes.value(placeHolder);
- handledIndexes << indexes;
- prunedValues << values.at(indexes.first());
-@@ -491,7 +501,7 @@
- if (paramCountIsValid) {
- for (int i = 0; i < paramCount; ++i) {
- res = SQLITE_OK;
-- const QVariant value = values.at(i);
-+ const QVariant &value = values.at(i);
-
- if (value.isNull()) {
- res = sqlite3_bind_null(d->stmt, i + 1);
-@@ -900,13 +910,24 @@
- {
- QString schema;
- QString table(tableName);
-- int indexOfSeparator = tableName.indexOf(QLatin1Char('.'));
-+ const int indexOfSeparator = tableName.indexOf(QLatin1Char('.'));
- if (indexOfSeparator > -1) {
-- schema = tableName.left(indexOfSeparator).append(QLatin1Char('.'));
-- table = tableName.mid(indexOfSeparator + 1);
-+ const int indexOfCloseBracket = tableName.indexOf(QLatin1Char(']'));
-+ if (indexOfCloseBracket != tableName.size() - 1) {
-+ // Handles a case like databaseName.tableName
-+ schema = tableName.left(indexOfSeparator + 1);
-+ table = tableName.mid(indexOfSeparator + 1);
-+ } else {
-+ const int indexOfOpenBracket =
tableName.lastIndexOf(QLatin1Char('['), indexOfCloseBracket);
-+ if (indexOfOpenBracket > 0) {
-+ // Handles a case like databaseName.[tableName]
-+ schema = tableName.left(indexOfOpenBracket);
-+ table = tableName.mid(indexOfOpenBracket);
-+ }
-+ }
- }
-- q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info (")
+ _q_escapeIdentifier(table) + QLatin1Char(')'));
--
-+ q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info (") +
-+ _q_escapeIdentifier(table, QSqlDriver::TableName) +
QLatin1Char(')'));
- QSqlIndex ind;
- while (q.next()) {
- bool isPk = q.value(5).toInt();
-@@ -968,8 +989,7 @@
-
- QString QSQLiteDriver::escapeIdentifier(const QString &identifier,
IdentifierType type) const
- {
-- Q_UNUSED(type);
-- return _q_escapeIdentifier(identifier);
-+ return _q_escapeIdentifier(identifier, type);
- }
-
- static void handle_sqlite_callback(void *qobj,int aoperation, char const
*adbname, char const *atablename,
-@@ -1046,3 +1066,5 @@
- }
-
- QT_END_NAMESPACE
-+
-+#include "moc_qsql_sqlite_p.cpp"
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild
b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild
deleted file mode 100644
index 60da9b9a752b..000000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt SQL driver plugin for SQLCipher"
-HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher";
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1" # version 2.1 only
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-db/sqlcipher-3.4.1
- >=dev-qt/qtcore-5.15.16:5=
- >=dev-qt/qtsql-5.15.16:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-1.0.10-install-path.patch
- cp -a "${S}"/qt-file-cache/5.15.{0,16} || die
- eapply "${FILESDIR}"/${P}-qt-5.15.16.patch
- sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
-
- local v=$(best_version dev-qt/qtsql:5)
- v=$(ver_cut 1-3 ${v#*/qtsql-})
- [[ -n ${v} ]] || die "could not determine qtsql version"
- if ! [[ -d qt-file-cache/${v} ]]; then
- local vc
- case $(ver_cut 1-2 ${v}) in
- 5.15) vc=5.15.16 ;;
- *) die "qtsql-${v} not supported" ;;
- esac
- elog "qtsql-${v} not in cache, using ${vc} instead"
- cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
- fi
-
- cmake_src_prepare
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./qsqlcipher-test || die
-}
