diff options
Diffstat (limited to 'dev-db/kdb')
| -rw-r--r-- | dev-db/kdb/Manifest | 3 | ||||
| -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 |
3 files changed, 37 insertions, 1 deletions
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest index 87b274952fae..77fb1ef5557f 100644 --- a/dev-db/kdb/Manifest +++ b/dev-db/kdb/Manifest @@ -1,4 +1,5 @@ +AUX kdb-3.2.0-postgresql-gcc12.patch 1355 BLAKE2B 1884b7b1db9a60a625722a3d20cfc8aece7320675aaa627737edd841997859de9ac499f8c07101eed67d1190a66334a23a99562819f30466f5c56fc566f437a0 SHA512 c6527802b3c34661717fd190f11385d8a4338ec5e3757ebdbc48df36ef40d7f6bcf44cba221faeef95507045840a5652e996b1621890c25d3944df1a4089607a DIST kdb-3.2.0-patches.tar.xz 7448 BLAKE2B 924a3ac0db2fedfa6d757dcb96fefc48540d5bee7dd2e1239e0e7eca9765393e3b72b13365a66a8e336a655aa4c8978e800f3baa86b704e85134d0c7281b90d7 SHA512 4fe59f33059dcfe19a26bed93615ce152f321f040daa57a2e6747a397aebbc896cd6c964cd2cb1350762552173ff146e4e51b864aa098ec5ae77e0dd6c6d9a2f DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7 -EBUILD kdb-3.2.0-r2.ebuild 1633 BLAKE2B 698e0e01010ffd8572aee2e8ec0fc44c316250872004de93b8a8a746ac76ee97061be9549c64730d520d86c1323d0b29b8bc1f86c2a0b78ccd024dadabf885ca SHA512 62f815551b0abd3fd1aaa728c66d3bc3712671a9fb8c8769f2c19a7f8248c78c315e7c354a910d43de3d050f2d129a09f2c9d99d037dd2e91e7e8c86daa3b608 +EBUILD kdb-3.2.0-r2.ebuild 1689 BLAKE2B 8d56e52f6c5ca655557ceffc9a52c04d63a19df1a1d20d5c715049f65aeb47e54c26c27abebaeb2a6d813a4bf045e86ceeb320c8f06a2d96a950c02cff38e53c SHA512 9f8b07d26d09936cff23f988f057f0f76392734413a2f36ee807251c5faed7bb396230ed269fb734c327da3e46017a3797ddd694d50c05a8875437061e642b4c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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() { |