chatterino2: unbreak

This commit is contained in:
q66 2019-12-15 19:24:14 +01:00
parent ce02dea5c9
commit ae7b535909
2 changed files with 13 additions and 15 deletions

View file

@ -7,18 +7,18 @@ Subject: [PATCH] disabled hash<QString> for Qt 5.14
src/util/QStringHash.hpp | 2 ++
1 file changed, 2 insertions(+)
--- src/util/qstringhash.hpp 2018-06-25 12:52:07.000000000 +0200
+++ - 2019-11-16 14:08:54.342448158 +0100
--- src/util/QStringHash.hpp 2018-06-25 12:52:07.000000000 +0200
+++ src/util/QStringHash.hpp 2019-11-16 14:08:54.342448158 +0100
@@ -3,6 +3,7 @@
#include <QHash>
#include <QString>
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace std {
template <>
struct hash<QString> {
#include <QHash>
#include <QString>
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace std {
template <>
struct hash<QString> {
@@ -12,3 +13,4 @@
}
};
} // namespace std
+#endif
}
};
} // namespace std
+#endif

View file

@ -26,8 +26,6 @@ f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/24692/steps/shell_3/logs/stdio"
case "${XBPS_TARGET_MACHINE}" in
armv[56]*|ppc|ppc-musl)
makedepends+=" libatomic-devel"