diff --git a/net-wireless/qflipper/Manifest b/net-wireless/qflipper/Manifest index 3e1fa8075..6a62cea8d 100644 --- a/net-wireless/qflipper/Manifest +++ b/net-wireless/qflipper/Manifest @@ -1,2 +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 +DIST qflipper-1.3.3.tar.gz 1290922 BLAKE2B 79dfec71e5f5fcbee61b7cc6bb7a55a61d7c2766465919122b8a77d096c8453a6e498fa5e9a7814091177c7f6afc4b244e63f79e608a0fd6f29264d793469473 SHA512 55f19517982dbcc52f586bafd1c6f3d9acc9c81c29e3f42bc4e4d2f09c962b976bfb97406e20c7a126b9f555b2e6b6e420fa94cd97b07877d00ef74e425e6751 diff --git a/net-wireless/qflipper/files/qflipper-nanopb.patch b/net-wireless/qflipper/files/qflipper-nanopb.patch new file mode 100644 index 000000000..811509dca --- /dev/null +++ b/net-wireless/qflipper/files/qflipper-nanopb.patch @@ -0,0 +1,11 @@ +--- a/qflipper_common.pri.orig 2024-02-10 08:36:41.914137638 +0800 ++++ b/qflipper_common.pri 2024-02-10 08:51:51.385156397 +0800 +@@ -2,6 +2,8 @@ + + equals(QT_MAJOR_VERSION, 6): QT += core5compat + ++INCLUDEPATH += "/usr/include/nanopb" ++ + unix:!macx { + DEFINES += USB_BACKEND_LIBUSB + CONFIG += link_pkgconfig diff --git a/net-wireless/qflipper/qflipper-1.3.0.ebuild b/net-wireless/qflipper/qflipper-1.3.0-r1.ebuild similarity index 97% rename from net-wireless/qflipper/qflipper-1.3.0.ebuild rename to net-wireless/qflipper/qflipper-1.3.0-r1.ebuild index 82944c6a2..08670e171 100644 --- a/net-wireless/qflipper/qflipper-1.3.0.ebuild +++ b/net-wireless/qflipper/qflipper-1.3.0-r1.ebuild @@ -40,12 +40,12 @@ RDEPEND=" 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" + "${FILESDIR}/${PN}-nanopb.patch" ) src_configure() { diff --git a/net-wireless/qflipper/qflipper-1.2.2.ebuild b/net-wireless/qflipper/qflipper-1.3.3.ebuild similarity index 82% rename from net-wireless/qflipper/qflipper-1.2.2.ebuild rename to net-wireless/qflipper/qflipper-1.3.3.ebuild index e20187ffd..bfffe2a8f 100644 --- a/net-wireless/qflipper/qflipper-1.2.2.ebuild +++ b/net-wireless/qflipper/qflipper-1.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,17 +8,14 @@ inherit qmake-utils DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC" HOMEPAGE="https://update.flipperzero.one/" -#MY_PV="${PV//_/-}" - LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git" - KEYWORDS="" else - KEYWORDS="amd64 ~arm64 x86" + 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 @@ -43,11 +40,12 @@ RDEPEND=" virtual/libusb:1 " DEPEND="${RDEPEND}" -BDEPEND="" +# https://github.com/flipperdevices/qFlipper/issues/213 PATCHES=( - "${FILESDIR}/${PN}-1.2.0_unbundle.patch" - "${FILESDIR}/${P}_display_version.patch" + "${FILESDIR}/${PN}-1.3.0_unbundle.patch" + "${FILESDIR}/${PN}-1.3.0_display_version.patch" + "${FILESDIR}/${PN}-nanopb.patch" ) src_configure() { diff --git a/net-wireless/qflipper/qflipper-9999.ebuild b/net-wireless/qflipper/qflipper-9999.ebuild index 503dde92b..22354f692 100644 --- a/net-wireless/qflipper/qflipper-9999.ebuild +++ b/net-wireless/qflipper/qflipper-9999.ebuild @@ -40,7 +40,6 @@ RDEPEND=" virtual/libusb:1 " DEPEND="${RDEPEND}" -BDEPEND="" PATCHES=( "${FILESDIR}/${PN}-1.3.0_unbundle.patch"