Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-09 04:51:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1209 from thican/qflipper_fix_pb_release

Browse source 
net-wireless/qflipper: Calls nanopb with required symbole
This commit is contained in:
Anton Bolshakov 2022-08-11 09:06:38 +08:00 committed by GitHub
commit 49263bb380
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 108 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
net-wireless/qflipper/files/qflipper-1.1.1_display_version.patch Normal file
View file

@ -0,0 +1,28 @@
diff --git a/qflipper_common.pri b/qflipper_common.pri
index e24d6acd..2f5dd504 100644
--- a/qflipper_common.pri
+++ b/qflipper_common.pri
@@ -25,20 +25,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.1.1
-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
-!equals(HAS_COMMIT, 0) {
- GIT_COMMIT = unknown
-}
+GIT_COMMIT = 9e1b07c9
-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
-!equals(HAS_TIMESTAMP, 0) {
- GIT_TIMESTAMP = 0
-}
+GIT_TIMESTAMP = 1658935746
DEFINES += APP_NAME=\\\"$$NAME\\\" \
APP_VERSION=\\\"$$GIT_VERSION\\\" \

55
net-wireless/qflipper/qflipper-1.1.1-r1.ebuild Normal file
View file

@ -0,0 +1,55 @@
# Copyright 2022 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/ https://github.com/flipperdevices/qFlipper"
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
RDEPEND="
>=dev-libs/nanopb-0.4.5[pb-malloc]
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/qtwidgets:5=
sys-libs/zlib:=
virtual/libusb:1
"
DEPEND="${RDEPEND}"
BDEPEND=""
PATCHES=(
"${FILESDIR}/unbundle.patch"
"${FILESDIR}/${P}_display_version.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
}

49
net-wireless/qflipper/qflipper-1.1.1.ebuild
View file

@ -1,49 +0,0 @@
# Copyright 2022 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"
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
RDEPEND="
>=dev-libs/libusb-1.0.16:=
sys-libs/zlib:=
dev-qt/qtquickcontrols:5=
dev-qt/qtquickcontrols2:5=
dev-qt/qtdeclarative:5=
dev-qt/qtwidgets:5=
dev-qt/qtgui:5=
dev-qt/qtdeclarative:5=
dev-qt/qtnetwork:5=
dev-qt/qtserialport:5=
>=dev-qt/qtcore-5.15.0:5=
dev-libs/nanopb"
DEPEND="${RDEPEND}"
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
}

45
net-wireless/qflipper/qflipper-9999.ebuild
View file

@ -5,45 +5,50 @@ EAPI=8
inherit qmake-utils
DESCRIPTION="desktop application for updating Flipper Zero firmware"
HOMEPAGE="https://update.flipperzero.one/"
DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
HOMEPAGE="https://update.flipperzero.one/ https://github.com/flipperdevices/qFlipper"
LICENSE="GPL-3+"
SLOT="0"
if [ "${PV}" = "9999" ]; then
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
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
RDEPEND="
>=dev-libs/libusb-1.0.16:=
sys-libs/zlib:=
>=dev-libs/nanopb-0.4.5[pb-malloc]
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/qtdeclarative:5=
dev-qt/qtwidgets:5=
dev-qt/qtgui:5=
dev-qt/qtdeclarative:5=
dev-qt/qtnetwork:5=
dev-qt/qtserialport:5=
>=dev-qt/qtcore-5.15.0:5=
dev-libs/nanopb"
dev-qt/qtwidgets:5=
sys-libs/zlib:=
virtual/libusb:1
"
DEPEND="${RDEPEND}"
BDEPEND=""
PATCHES=(
"${FILESDIR}/unbundle.patch"
)
src_configure() {
eqmake5 qFlipper.pro PREFIX="${D}/usr" -spec linux-g++ CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES
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 PREFIX="${ED}/usr" install
}
pkg_postinst() {
#https://github.com/flipperdevices/qFlipper/issues/59
ewarn "qFlipper doesn't work, but qFlipper-cli does, use it."
emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
}