diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-09-14 15:13:33 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-09-14 15:13:33 +0200 |
| commit | 049698fb13d3ca400bd4771a35d3e5dcd5d1f939 (patch) | |
| tree | c7d000e94d0ad5637b94ade4c5ed9d86763ac979 /dev-db | |
| parent | media-gfx/digikam: add 7.8.0 (diff) | |
| download | gentoo-049698fb13d3ca400bd4771a35d3e5dcd5d1f939.tar.gz gentoo-049698fb13d3ca400bd4771a35d3e5dcd5d1f939.tar.bz2 gentoo-049698fb13d3ca400bd4771a35d3e5dcd5d1f939.zip | |
dev-db/kdb: Fix IUSE postgres with GCC-12
Upstream commit 48f9167e37c9a2d024c525cab0ba65a2e02e248f
Closes: https://bugs.gentoo.org/869368
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch | 34 | ||||
| -rw-r--r-- | dev-db/kdb/kdb-3.2.0-r2.ebuild | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch b/dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch new file mode 100644 index 000000000000..d62539179b13 --- /dev/null +++ b/dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch @@ -0,0 +1,34 @@ +From 48f9167e37c9a2d024c525cab0ba65a2e02e248f Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz <yselkowi@redhat.com> +Date: Mon, 20 Jun 2022 14:49:26 -0400 +Subject: [PATCH] postgresql: Fix build with GCC 12 (standard attributes in + middle of decl-specifiers) + +--- + src/drivers/postgresql/PostgresqlConnection_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/drivers/postgresql/PostgresqlConnection_p.h b/src/drivers/postgresql/PostgresqlConnection_p.h +index c0485786..99040c6a 100644 +--- a/src/drivers/postgresql/PostgresqlConnection_p.h ++++ b/src/drivers/postgresql/PostgresqlConnection_p.h +@@ -155,14 +155,14 @@ public: + return PQnfields(result); + } + +- inline Q_REQUIRED_RESULT KDbSqlField *field(int index) override ++ Q_REQUIRED_RESULT inline KDbSqlField *field(int index) override + { + return new PostgresqlSqlField(result, index); + } + + Q_REQUIRED_RESULT KDbField *createField(const QString &tableName, int index) override; + +- inline Q_REQUIRED_RESULT QSharedPointer<KDbSqlRecord> fetchRecord() override ++ Q_REQUIRED_RESULT inline QSharedPointer<KDbSqlRecord> fetchRecord() override + { + return QSharedPointer<KDbSqlRecord>(recordToFetch < recordsCount + ? new PostgresqlSqlRecord(result, recordToFetch++) +-- +GitLab + diff --git a/dev-db/kdb/kdb-3.2.0-r2.ebuild b/dev-db/kdb/kdb-3.2.0-r2.ebuild index caf82c0d8d8c..94af5b00c771 100644 --- a/dev-db/kdb/kdb-3.2.0-r2.ebuild +++ b/dev-db/kdb/kdb-3.2.0-r2.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${WORKDIR}"/${P}-patches/${P}-gcc12.patch # master "${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch + "${FILESDIR}"/${P}-postgresql-gcc12.patch # bug 869368 ) pkg_setup() { |