diff options
| author |   Denis Pronin <dannftk@yandex.ru> | 2024-03-25 14:15:30 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-05-28 02:57:50 +0100 |
| commit | b61461426061051c12558ac0b7ddf0e95094cc4c (patch) | |
| tree | 54da5dccdb080c81e7cf814955d72db6ca89edb1 /dev-db | |
| parent | x11-misc/libinput-gestures: restore lost changes (diff) | |
| download | gentoo-b61461426061051c12558ac0b7ddf0e95094cc4c.tar.gz gentoo-b61461426061051c12558ac0b7ddf0e95094cc4c.tar.bz2 gentoo-b61461426061051c12558ac0b7ddf0e95094cc4c.zip | |
dev-db/sqlitebrowser: add patch to fix conflict that str macro brings in
sometimes expanding str() gives an error because it conflicts with str()
method of, for example, std::ostringstream::str()
This patch is dedicated to fixing this circumstance
Closes https://bugs.gentoo.org/932577
Signed-off-by: Denis Pronin <dannftk@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35909
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch | 13 | ||||
| -rw-r--r-- | dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch new file mode 100644 index 000000000000..07284ca8ba0c --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch @@ -0,0 +1,13 @@ +--- a/src/version.h ++++ b/src/version.h +@@ -4,8 +4,8 @@ + #define MINOR_VERSION 12 + #define PATCH_VERSION 2 + +-#define str(s) #s +-#define xstr(s) str(s) ++#define stringize(s) #s ++#define xstr(s) stringize(s) + #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION) + + // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format. diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild index 47ce7cb6cacc..0b6665b1dd80 100644 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild +++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild @@ -46,6 +46,10 @@ RDEPEND=" >=dev-qt/qtsvg-5.5:5 " +PATCHES=( + "${FILESDIR}/${P}-str-conflict-fix.patch" +) + src_prepare() { cmake_src_prepare |