mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 08:25:01 +01:00
net-wireless/qflipper: fix build under Qt 6.9
Source upstream: https://github.com/flipperdevices/qFlipper/pull/233 Closes: https://bugs.gentoo.org/959273 Signed-off-by: Thibaud CANALE <thican@thican.net>
This commit is contained in:
parent
369e0a245a
commit
cd22a3715c
2 changed files with 41 additions and 0 deletions
|
|
@ -0,0 +1,40 @@
|
||||||
|
From 57316893037d119931011d9abd4a05ed158c7a24 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Suchanek <msuchanek@suse.de>
|
||||||
|
Date: Tue, 8 Apr 2025 17:06:42 +0200
|
||||||
|
Subject: [PATCH] Define == for DeviceInfo
|
||||||
|
|
||||||
|
Looks like some newer Qt versions require == instead of !=.
|
||||||
|
|
||||||
|
Define both.
|
||||||
|
---
|
||||||
|
backend/flipperzero/deviceinfo.h | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/backend/flipperzero/deviceinfo.h b/backend/flipperzero/deviceinfo.h
|
||||||
|
index deaa18b1..3cfd5f91 100644
|
||||||
|
--- a/backend/flipperzero/deviceinfo.h
|
||||||
|
+++ b/backend/flipperzero/deviceinfo.h
|
||||||
|
@@ -31,6 +31,7 @@ struct HardwareInfo {
|
||||||
|
|
||||||
|
// Needed in order to work with QVariant
|
||||||
|
bool operator !=(const HardwareInfo &other) const { Q_UNUSED(other) return true; }
|
||||||
|
+ bool operator ==(const HardwareInfo &other) const { Q_UNUSED(other) return false; }
|
||||||
|
};
|
||||||
|
|
||||||
|
struct SoftwareInfo {
|
||||||
|
@@ -50,6 +51,7 @@ struct SoftwareInfo {
|
||||||
|
|
||||||
|
// Needed in order to work with QVariant
|
||||||
|
bool operator !=(const SoftwareInfo &other) const { Q_UNUSED(other) return true; }
|
||||||
|
+ bool operator ==(const SoftwareInfo &other) const { Q_UNUSED(other) return false; }
|
||||||
|
};
|
||||||
|
|
||||||
|
struct StorageInfo {
|
||||||
|
@@ -67,6 +69,7 @@ struct StorageInfo {
|
||||||
|
|
||||||
|
// Needed in order to work with QVariant
|
||||||
|
bool operator !=(const StorageInfo &other) const { Q_UNUSED(other) return true; }
|
||||||
|
+ bool operator ==(const StorageInfo &other) const { Q_UNUSED(other) return false; }
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ProtobufInfo {
|
||||||
|
|
@ -33,6 +33,7 @@ DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
# https://github.com/flipperdevices/qFlipper/issues/213
|
# https://github.com/flipperdevices/qFlipper/issues/213
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
|
"${FILESDIR}/${PN}_define_operator_qt6.9.patch"
|
||||||
"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
|
"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
|
||||||
"${FILESDIR}/${P}_display_version.patch"
|
"${FILESDIR}/${P}_display_version.patch"
|
||||||
)
|
)
|
||||||
Loading…
Reference in a new issue