Merge pull request #2429 from thican/net-wireless/qflipper_qt6.9

net-wireless/qflipper: fix build under Qt 6.9, #959273

net-wireless/qflipper/files/qflipper_define_operator_qt6.9.patch

@@ -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 {

net-wireless/qflipper/qflipper-1.3.3-r1.ebuild

@@ -1,76 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
-HOMEPAGE="https://update.flipperzero.one/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/qFlipper-${PV}"
-IUSE="+qt5 qt6"
-REQUIRED_USE="^^ ( qt5 qt6 )"
-
-RDEPEND="
-	>=dev-libs/nanopb-0.4.5[pb-malloc]
-	qt5? (
-		dev-qt/qtconcurrent:5=
-		dev-qt/qtcore:5=
-		dev-qt/qtdeclarative:5=
-		dev-qt/qtgui:5=[jpeg]
-		dev-qt/qtnetwork:5=
-		dev-qt/qtquickcontrols:5=
-		dev-qt/qtquickcontrols2:5=
-		dev-qt/qtserialport:5=
-		dev-qt/qtsvg:5=
-		dev-qt/qtwidgets:5=
-	)
-	qt6? (
-		dev-qt/qtbase:6=[concurrent,evdev,gui,network,widgets]
-		dev-qt/qtdeclarative:6=
-		dev-qt/qtserialport:6=
-		dev-qt/qtshadertools:6=
-		dev-qt/qtsvg:6=
-		dev-qt/qttools:6=
-		dev-qt/qtwayland:6=
-		dev-qt/qt5compat:6=
-	)
-	sys-libs/zlib:=
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-
-# https://github.com/flipperdevices/qFlipper/issues/213
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
-	"${FILESDIR}/${P}_display_version.patch"
-)
-
-src_configure() {
-	local qmake_args=(
-		qFlipper.pro
-		PREFIX="${EPREFIX}/usr"
-		-spec linux-g++
-		CONFIG+=qtquickcompiler
-		DEFINES+=DISABLE_APPLICATION_UPDATES
-	)
-	use qt5 && \
-		eqmake5 "${qmake_args[@]}"
-	use qt6 && \
-		eqmake6 "${qmake_args[@]}"
-}
-
-src_compile() {
-	emake qmake_all # rebuild Makefiles in subdirs
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
-}

net-wireless/qflipper/qflipper-1.3.3-r3.ebuild

@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}"
 
 # https://github.com/flipperdevices/qFlipper/issues/213
 PATCHES=(
+	"${FILESDIR}/${PN}_define_operator_qt6.9.patch"
 	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
 	"${FILESDIR}/${P}_display_version.patch"
 )