| 1 |
commit: 049698fb13d3ca400bd4771a35d3e5dcd5d1f939 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 14 13:13:33 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 14 13:13:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049698fb |
| 7 |
|
| 8 |
dev-db/kdb: Fix IUSE postgres with GCC-12 |
| 9 |
|
| 10 |
Upstream commit 48f9167e37c9a2d024c525cab0ba65a2e02e248f |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/869368 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch | 34 +++++++++++++++++++++++ |
| 16 |
dev-db/kdb/kdb-3.2.0-r2.ebuild | 1 + |
| 17 |
2 files changed, 35 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..d62539179b13 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-db/kdb/files/kdb-3.2.0-postgresql-gcc12.patch |
| 24 |
@@ -0,0 +1,34 @@ |
| 25 |
+From 48f9167e37c9a2d024c525cab0ba65a2e02e248f Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Yaakov Selkowitz <yselkowi@××××××.com> |
| 27 |
+Date: Mon, 20 Jun 2022 14:49:26 -0400 |
| 28 |
+Subject: [PATCH] postgresql: Fix build with GCC 12 (standard attributes in |
| 29 |
+ middle of decl-specifiers) |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ src/drivers/postgresql/PostgresqlConnection_p.h | 4 ++-- |
| 33 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/drivers/postgresql/PostgresqlConnection_p.h b/src/drivers/postgresql/PostgresqlConnection_p.h |
| 36 |
+index c0485786..99040c6a 100644 |
| 37 |
+--- a/src/drivers/postgresql/PostgresqlConnection_p.h |
| 38 |
++++ b/src/drivers/postgresql/PostgresqlConnection_p.h |
| 39 |
+@@ -155,14 +155,14 @@ public: |
| 40 |
+ return PQnfields(result); |
| 41 |
+ } |
| 42 |
+ |
| 43 |
+- inline Q_REQUIRED_RESULT KDbSqlField *field(int index) override |
| 44 |
++ Q_REQUIRED_RESULT inline KDbSqlField *field(int index) override |
| 45 |
+ { |
| 46 |
+ return new PostgresqlSqlField(result, index); |
| 47 |
+ } |
| 48 |
+ |
| 49 |
+ Q_REQUIRED_RESULT KDbField *createField(const QString &tableName, int index) override; |
| 50 |
+ |
| 51 |
+- inline Q_REQUIRED_RESULT QSharedPointer<KDbSqlRecord> fetchRecord() override |
| 52 |
++ Q_REQUIRED_RESULT inline QSharedPointer<KDbSqlRecord> fetchRecord() override |
| 53 |
+ { |
| 54 |
+ return QSharedPointer<KDbSqlRecord>(recordToFetch < recordsCount |
| 55 |
+ ? new PostgresqlSqlRecord(result, recordToFetch++) |
| 56 |
+-- |
| 57 |
+GitLab |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/dev-db/kdb/kdb-3.2.0-r2.ebuild b/dev-db/kdb/kdb-3.2.0-r2.ebuild |
| 61 |
index caf82c0d8d8c..94af5b00c771 100644 |
| 62 |
--- a/dev-db/kdb/kdb-3.2.0-r2.ebuild |
| 63 |
+++ b/dev-db/kdb/kdb-3.2.0-r2.ebuild |
| 64 |
@@ -51,6 +51,7 @@ PATCHES=( |
| 65 |
"${WORKDIR}"/${P}-patches/${P}-gcc12.patch |
| 66 |
# master |
| 67 |
"${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch |
| 68 |
+ "${FILESDIR}"/${P}-postgresql-gcc12.patch # bug 869368 |
| 69 |
) |
| 70 |
|
| 71 |
pkg_setup() { |
Archives