[gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/, dev-db/kdb/files/

[gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/, dev-db/kdb/files/

[Andreas Sturmlechner]

commit:     049698fb13d3ca400bd4771a35d3e5dcd5d1f939
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 13:13:33 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 13:13:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049698fb

dev-db/kdb: Fix IUSE postgres with GCC-12

Upstream commit 48f9167e37c9a2d024c525cab0ba65a2e02e248f

Closes: https://bugs.gentoo.org/869368
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch | 34 +++++++++++++++++++++++
 dev-db/kdb/kdb-3.2.0-r2.ebuild                    |  1 +
 2 files changed, 35 insertions(+)

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() {