net-wireless/qflipper: add 1.3.0

Also address QA warning MultipleKeywordsLine (based on `pkgcheck scan`)
for stable and live ebuilds.

Signed-off-by: Thibaud CANALE <thican@thican.net>

net-wireless/qflipper/Manifest

@@ -1 +1,2 @@
 DIST qflipper-1.2.2.tar.gz 1285161 BLAKE2B 27a85373177c5900b85c3eedce08420d0c46221231d805fc6dd1e0c7214e50e075290aeb6ab82f3347a58e55597962acfb19ceb2e8377c461ec1a5487377b247 SHA512 5779f695d3a7f456bf11f34707c5deeed5840bf2a476592389c804c47de9f0bd8f77737cec465f9d8331d38263022b05a12629b4d944012995f4067b51eabaff
+DIST qflipper-1.3.0.tar.gz 1290478 BLAKE2B b7a4b207a2601fc35e5a3784da4eb46a6e42cc344a81fb3a07b85cc8266b4859470fb77351b4c3ab49864737692e86f16aeb6c726ef667fba22c0128d7695414 SHA512 b762ec0ab4bf377af9c7cc0265b9e901dd224f27a5551a051bd0870094803db4a38ee3b23c67eae6285516791833f348d152a3caa8917581bb67d03c831c10ca

net-wireless/qflipper/files/qflipper-1.3.0_Fix-unknown-type-error-in-Qt5-builds.patch

@@ -0,0 +1,27 @@
+From 7a6770bf4f51e7be93d027403f70061b791d6a3d Mon Sep 17 00:00:00 2001
+From: Georgii Surkov <georgii.surkov@outlook.com>
+Date: Mon, 10 Apr 2023 12:33:19 +0300
+Subject: [PATCH] Fix unknown type error in Qt5 builds
+
+Signed-off-by: Thibaud CANALE <thican@thican.net>
+---
+ backend/applicationbackend.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/backend/applicationbackend.cpp b/backend/applicationbackend.cpp
+index c763e40b..32baa7b1 100644
+--- a/backend/applicationbackend.cpp
++++ b/backend/applicationbackend.cpp
+@@ -417,6 +417,9 @@ void ApplicationBackend::registerMetaTypes()
+     qRegisterMetaType<Flipper::Zero::AssetManifest::FileInfo>();
+ 
+     qRegisterMetaType<QAbstractListModel*>();
++
++    qRegisterMetaType<InputEvent::Key>();
++    qRegisterMetaType<InputEvent::Type>();
+ }
+ 
+ #if QT_VERSION < 0x060000
+-- 
+2.39.2
+

net-wireless/qflipper/files/qflipper-1.3.0_display_version.patch

@@ -0,0 +1,34 @@
+---
+ qflipper_common.pri | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/qflipper_common.pri b/qflipper_common.pri
+index 6266badf..8a293d05 100644
+--- a/qflipper_common.pri
++++ b/qflipper_common.pri
+@@ -27,20 +27,11 @@ unix:!macx {
+     error("Unsupported OS or compiler")
+ }
+ 
+-GIT_VERSION = $$system("git describe --tags --abbrev=0","lines", HAS_VERSION)
+-!equals(HAS_VERSION, 0) {
+-    GIT_VERSION = unknown
+-}
++GIT_VERSION = 1.3.0
+ 
+-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
+-!equals(HAS_COMMIT, 0) {
+-    GIT_COMMIT = unknown
+-}
++GIT_COMMIT = 01fcfec9
+ 
+-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
+-!equals(HAS_TIMESTAMP, 0) {
+-    GIT_TIMESTAMP = 0
+-}
++GIT_TIMESTAMP = 1679910698
+ 
+ DEFINES += APP_NAME=\\\"$$NAME\\\" \
+            APP_VERSION=\\\"$$GIT_VERSION\\\" \
+-- 
+2.39.2

net-wireless/qflipper/files/qflipper-1.3.0_unbundle.patch

@@ -0,0 +1,95 @@
+---
+ application/application.pro             | 5 ++---
+ cli/cli.pro                             | 5 ++---
+ plugins/flipperproto0/flipperproto0.pro | 5 ++---
+ qFlipper.pro                            | 2 --
+ 4 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/application/application.pro b/application/application.pro
+index c8b24333..28683b70 100644
+--- a/application/application.pro
++++ b/application/application.pro
+@@ -47,8 +47,7 @@ win32:!win32-g++ {
+         $$OUT_PWD/../dfu/libdfu.a
+ 
+     contains(CONFIG, static): PRE_TARGETDEPS += \
+-        $$OUT_PWD/../plugins/libflipperproto0.a \
+-        $$OUT_PWD/../3rdparty/lib3rdparty.a
++        $$OUT_PWD/../plugins/libflipperproto0.a
+ }
+ 
+ unix|win32 {
+@@ -58,7 +57,7 @@ unix|win32 {
+ 
+     contains(CONFIG, static): LIBS += \
+         -L$$OUT_PWD/../plugins/ -lflipperproto0 \
+-        -L$$OUT_PWD/../3rdparty/ -l3rdparty
++        -lprotobuf-nanopb
+ }
+ 
+ win32 {
+diff --git a/cli/cli.pro b/cli/cli.pro
+index 5c007e7d..fe0106ee 100644
+--- a/cli/cli.pro
++++ b/cli/cli.pro
+@@ -20,8 +20,7 @@ win32:!win32-g++ {
+         $$OUT_PWD/../dfu/libdfu.a
+ 
+     contains(CONFIG, static): PRE_TARGETDEPS += \
+-        $$OUT_PWD/../plugins/libflipperproto0.a \
+-        $$OUT_PWD/../3rdparty/lib3rdparty.a
++        $$OUT_PWD/../plugins/libflipperproto0.a
+ }
+ 
+ unix|win32 {
+@@ -31,7 +30,7 @@ unix|win32 {
+ 
+     contains(CONFIG, static): LIBS += \
+         -L$$OUT_PWD/../plugins/ -lflipperproto0 \
+-        -L$$OUT_PWD/../3rdparty/ -l3rdparty
++        -lprotobuf-nanopb
+ }
+ 
+ win32 {
+diff --git a/plugins/flipperproto0/flipperproto0.pro b/plugins/flipperproto0/flipperproto0.pro
+index 64848402..c6b9fee7 100644
+--- a/plugins/flipperproto0/flipperproto0.pro
++++ b/plugins/flipperproto0/flipperproto0.pro
+@@ -12,8 +12,7 @@ CONFIG += plugin c++11
+ 
+ VERSION = 0.0.0
+ 
+-INCLUDEPATH += $$PWD/../protobufinterface \
+-    $$PWD/../../3rdparty/nanopb
++INCLUDEPATH += $$PWD/../protobufinterface
+ 
+ HEADERS += \
+     guirequest.h \
+@@ -65,7 +64,7 @@ SOURCES += \
+     systemresponse.cpp
+ 
+ unix|win32 {
+-    LIBS += -L$$OUT_PWD/../../3rdparty/ -l3rdparty
++    LIBS += -lprotobuf-nanopb
+ }
+ 
+ DEFINES += PB_ENABLE_MALLOC
+diff --git a/qFlipper.pro b/qFlipper.pro
+index 1bb97627..8b2a6c44 100644
+--- a/qFlipper.pro
++++ b/qFlipper.pro
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+ 
+ SUBDIRS += \
+-    3rdparty \
+     application \
+     backend \
+     dfu \
+@@ -11,4 +10,3 @@ SUBDIRS += \
+ backend.depends = dfu plugins
+ application.depends = backend
+ cli.depends = backend
+-plugins.depends = 3rdparty
+-- 
+2.39.2

net-wireless/qflipper/qflipper-1.3.0.ebuild

@@ -0,0 +1,63 @@
+# Copyright 2023 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"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/qFlipper-${PV}"
+fi
+IUSE="+qt5"
+REQUIRED_USE="^^ ( qt5 )"
+
+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=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtquickcontrols:5=
+		dev-qt/qtquickcontrols2:5=
+		dev-qt/qtserialport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5=
+	)
+	sys-libs/zlib:=
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
+	"${FILESDIR}/${P}_display_version.patch"
+	"${FILESDIR}/${P}_Fix-unknown-type-error-in-Qt5-builds.patch"
+)
+
+src_configure() {
+	eqmake5 qFlipper.pro PREFIX="${EPREFIX}/usr" -spec linux-g++ \
+		CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES
+}
+
+src_compile() {
+	emake qmake_all # rebuild Makefiles in subdirs
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}

net-wireless/qflipper/qflipper-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,6 @@ SLOT="0"
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
-	KEYWORDS=""
 else
 	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
@@ -44,7 +43,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.2.0_unbundle.patch"
+	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
 )
 
 src_configure() {