qflipper: 1.0.1, fix for flipperdevices/qFlipper#59

dev-libs/nanopb/Manifest

@@ -0,0 +1 @@
+DIST nanopb-0.4.6.tar.gz 1136511 BLAKE2B 142fdda099f7fd31e07ee500dbf06a63ab3d1019b1286235936b091461a0ef1920d08589b57a668d9b107944374fbba12f1352b498149f113e53264942f888cf SHA512 ba41eff02b8082f9ab6dc0b462130ca26f86685281ff7e1cb4b72be3d107f6e165921a3250358519800dc4323706700186bfe10c964418d61e20431ef2b8d9b7

dev-libs/nanopb/nanopb-0.4.6.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="plain-C Protocol Buffers for embedded/memory-constrained systems"
+HOMEPAGE="http://koti.kapsi.fi/jpa/nanopb/"
+SRC_URI="http://koti.kapsi.fi/~jpa/nanopb/download/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/protobuf
+"
+DEPEND="
+	dev-util/scons
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${PN}"
+
+src_test() {
+	cd "${S}"/tests
+	scons
+}

net-wireless/qflipper/Manifest

@@ -1 +1 @@
-DIST qflipper-1.0.1.tar.gz 1032084 BLAKE2B b15874ee0142375a0374527c0dbfbfd5a80d5ad7cc3ce82b3a926b8b8b5c2becd3fac5c842a7912bd6cca664fdca3b32825f68da89ab7b544dbd26b2509b4e65 SHA512 8244748381cfad7db061f5174af33895162ca9aeb1062ec9e985ea06a3f3d0650a85bf4af94056552af6675d787da5bc9a03e9541e7e34ccc1b69642cf265259
+DIST qflipper-1.1.0.tar.gz 1045027 BLAKE2B a228abc198ebd59d4a46c7f740cb28422809908f4bf13e7865430236be95487cd0d8a9ef685806573fd55d078ee48a4c160771b95bc11094f858e137490fc6e8 SHA512 7de2bd5c8c92b93dd2cf854c937de5e6da8cf0c7ee2d085a1efabd23c11a6a96a834639272c68e0af7d061f86c0d4207d4c693d50eeb98702a630b4d1baaf1bd

net-wireless/qflipper/files/unbundle.patch

@@ -0,0 +1,83 @@
+diff -Naur orig/cli/cli.pro new/cli/cli.pro
+--- orig/cli/cli.pro	2022-06-04 01:50:17.000000000 +0800
++++ new/cli/cli.pro	2022-07-14 11:44:58.962634294 +0800
+@@ -12,7 +12,7 @@
+ unix|win32 {
+     LIBS += \
+         -L$$OUT_PWD/../backend/ -lbackend \
+-        -L$$OUT_PWD/../3rdparty/ -l3rdparty \
++        -lprotobuf-nanopb \
+         -L$$OUT_PWD/../dfu/ -ldfu
+ }
+
+@@ -25,7 +25,7 @@
+ } else:unix|win32-g++ {
+     PRE_TARGETDEPS += \
+         $$OUT_PWD/../backend/libbackend.a \
+-        $$OUT_PWD/../3rdparty/lib3rdparty.a \
++        -lprotobuf-nanopb \
+         $$OUT_PWD/../dfu/libdfu.a
+ }
+
+@@ -53,8 +53,7 @@
+
+ DEPENDPATH += \
+     $$PWD/../dfu \
+-    $$PWD/../backend \
+-    $$PWD/../3rdparty \
++    $$PWD/../backend
+
+ SOURCES += \
+         main.cpp \
+
+diff -Naur orig/plugins/flipperproto0/flipperproto0.pro new/plugins/flipperproto0/flipperproto0.pro
+--- orig/plugins/flipperproto0/flipperproto0.pro	2022-06-04 01:50:17.000000000 +0800
++++ new/plugins/flipperproto0/flipperproto0.pro	2022-07-14 11:47:28.441625895 +0800
+@@ -12,8 +12,7 @@
+
+ VERSION = 0.0.0
+
+-INCLUDEPATH += $$PWD/../protobufinterface \
+-    $$PWD/../../3rdparty/nanopb
++INCLUDEPATH += $$PWD/../protobufinterface
+
+ HEADERS += \
+     guirequest.h \
+@@ -56,15 +55,14 @@
+     systemresponse.cpp
+
+ unix|win32 {
+-    LIBS += -L$$OUT_PWD/../../3rdparty/ -l3rdparty
++    LIBS += -lprotobuf-nanopb
+ }
+
+-win32:!win32-g++ {
+-    PRE_TARGETDEPS += $$OUT_PWD/../../3rdparty/3rdparty.lib
+-
+-} else:unix|win32-g++ {
+-    PRE_TARGETDEPS += $$OUT_PWD/../../3rdparty/lib3rdparty.a
+-}
++#win32:!win32-g++ {
++#    PRE_TARGETDEPS += $$OUT_PWD/../../3rdparty/3rdparty.lib
++#} else:unix|win32-g++ {
++#    PRE_TARGETDEPS += $$OUT_PWD/../../3rdparty/lib3rdparty.a
++#}
+
+ DEFINES += PB_ENABLE_MALLOC
+
+diff -Naur orig/qFlipper.pro new/qFlipper.pro
+--- orig/qFlipper.pro	2022-06-04 01:50:17.000000000 +0800
++++ new/qFlipper.pro	2022-07-14 11:15:16.793734425 +0800
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+
+ SUBDIRS += \
+-    3rdparty \
+     application \
+     backend \
+     dfu \
+@@ -11,4 +10,3 @@
+ backend.depends = dfu plugins
+ application.depends = backend
+ cli.depends = backend
+-plugins.depends = 3rdparty

net-wireless/qflipper/qflipper-1.0.1.ebuild → net-wireless/qflipper/qflipper-1.1.0.ebuild

@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
 else
-	#KEYWORDS="~amd64"
+	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
@@ -34,15 +34,15 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+src_prepare() {
+	eapply ${FILESDIR}/unbundle.patch
+	eapply_user
+}
+
 src_configure() {
 	eqmake5 qFlipper.pro PREFIX="${D}/usr" -spec linux-g++ CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES
 }
 
 src_install() {
 	emake PREFIX="${ED}/usr" install
 }
-
-pkg_postinst() {
-	#https://github.com/flipperdevices/qFlipper/issues/59
-	ewarn "qFlipper doesn't work, but qFlipper-cli does, use it."
-}

net-wireless/qflipper/qflipper-9999.ebuild

@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
 else
-	#KEYWORDS="~amd64"
+	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/qFlipper-${PV}"
 fi