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

qflipper: fix https://github.com/pentoo/pentoo-overlay/pull/1423

Browse source
This commit is contained in:
Anton Bolshakov 2022-12-15 17:48:54 +08:00
parent b64666839e
commit 2a0c46f17f
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
7 changed files with 14 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

83
net-wireless/qflipper/files/qflipper-1.1.2_unbundle.patch
View file

@ -1,83 +0,0 @@
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

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

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

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

@ -1,28 +0,0 @@
diff --git a/qflipper_common.pri b/qflipper_common.pri
index 6266badf..766a44f9 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.2.0
-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
-!equals(HAS_COMMIT, 0) {
- GIT_COMMIT = unknown
-}
+GIT_COMMIT = 49a2c9b4
-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
-!equals(HAS_TIMESTAMP, 0) {
- GIT_TIMESTAMP = 0
-}
+GIT_TIMESTAMP = 1663592547
DEFINES += APP_NAME=\\\"$$NAME\\\" \
APP_VERSION=\\\"$$GIT_VERSION\\\" \

6
net-wireless/qflipper/files/qflipper-1.2.1_display_version.patch → net-wireless/qflipper/files/qflipper-1.2.2_display_version.patch
View file

@ -10,19 +10,19 @@ index 6266badf..3ce3cd42 100644
-!equals(HAS_VERSION, 0) {
- GIT_VERSION = unknown
-}
+GIT_VERSION = 1.2.1
+GIT_VERSION = 1.2.2
-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
-!equals(HAS_COMMIT, 0) {
- GIT_COMMIT = unknown
-}
+GIT_COMMIT = 3ec0fd9d
+GIT_COMMIT = ba67025d
-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
-!equals(HAS_TIMESTAMP, 0) {
- GIT_TIMESTAMP = 0
-}
+GIT_TIMESTAMP = 1664810141
+GIT_TIMESTAMP = 1670502671
DEFINES += APP_NAME=\\\"$$NAME\\\" \
APP_VERSION=\\\"$$GIT_VERSION\\\" \

17
net-wireless/qflipper/qflipper-1.2.2.ebuild
View file

@ -6,21 +6,21 @@ EAPI=8
inherit qmake-utils
DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
HOMEPAGE="
https://update.flipperzero.one/
"
HOMEPAGE="https://update.flipperzero.one/"
MY_PV="${PV//_/-}"
#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"
SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/qFlipper-${MY_PV}"
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 )"
@ -47,11 +47,12 @@ BDEPEND=""
PATCHES=(
"${FILESDIR}/${PN}-1.2.0_unbundle.patch"
"${FILESDIR}/${PN}-1.2.1_display_version.patch"
"${FILESDIR}/${P}_display_version.patch"
)
src_configure() {
eqmake5 qFlipper.pro PREFIX="${EPREFIX}/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() {

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

@ -48,7 +48,8 @@ PATCHES=(
)
src_configure() {
eqmake5 qFlipper.pro PREFIX="${EPREFIX}/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() {