Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-20 22:01:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1867 from thican/issue_213-fix_qflipper_jpeg

Browse source 
net-wireless/qflipper: add jpeg dependency, issue #1446
This commit is contained in:
Anton Bolshakov 2024-04-02 07:03:41 +07:00 committed by GitHub
commit cfaa29e8ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 12 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net-wireless/qflipper/Manifest
View file

@ -1,2 +1 @@
DIST qflipper-1.3.0.tar.gz 1290478 BLAKE2B b7a4b207a2601fc35e5a3784da4eb46a6e42cc344a81fb3a07b85cc8266b4859470fb77351b4c3ab49864737692e86f16aeb6c726ef667fba22c0128d7695414 SHA512 b762ec0ab4bf377af9c7cc0265b9e901dd224f27a5551a051bd0870094803db4a38ee3b23c67eae6285516791833f348d152a3caa8917581bb67d03c831c10ca
DIST qflipper-1.3.3.tar.gz 1290922 BLAKE2B 79dfec71e5f5fcbee61b7cc6bb7a55a61d7c2766465919122b8a77d096c8453a6e498fa5e9a7814091177c7f6afc4b244e63f79e608a0fd6f29264d793469473 SHA512 55f19517982dbcc52f586bafd1c6f3d9acc9c81c29e3f42bc4e4d2f09c962b976bfb97406e20c7a126b9f555b2e6b6e420fa94cd97b07877d00ef74e425e6751

60
net-wireless/qflipper/files/qflipper-1.2.0_unbundle.patch
View file

@ -1,60 +0,0 @@
diff --git a/cli/cli.pro b/cli/cli.pro
index 6b5c27ac..4949fe70 100644
--- a/cli/cli.pro
+++ b/cli/cli.pro
@@ -11,13 +11,13 @@ CONFIG -= app_bundle
unix|win32 {
LIBS += \
- -L$$OUT_PWD/../3rdparty/ -l3rdparty \
+ -lprotobuf-nanopb \
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
-L$$OUT_PWD/../backend/ -lbackend \
-L$$OUT_PWD/../dfu/ -ldfu
contains(CONFIG, static): LIBS += \
- -L$$OUT_PWD/../3rdparty/ -l3rdparty \
+ -lprotobuf-nanopb \
-L$$OUT_PWD/../plugins/ -lflipperproto0
}
diff --git a/plugins/flipperproto0/flipperproto0.pro b/plugins/flipperproto0/flipperproto0.pro
index 1de45121..d8eab59b 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 \
@@ -59,7 +58,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

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

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

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

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

10
net-wireless/qflipper/files/qflipper-1.3.0_display_version.patch → net-wireless/qflipper/files/qflipper-1.3.3_display_version.patch
View file

@ -3,7 +3,7 @@
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/qflipper_common.pri b/qflipper_common.pri
index 6266badf..8a293d05 100644
index 6266badf..1a6793f9 100644
--- a/qflipper_common.pri
+++ b/qflipper_common.pri
@@ -27,20 +27,11 @@ unix:!macx {
@ -14,21 +14,21 @@ index 6266badf..8a293d05 100644
-!equals(HAS_VERSION, 0) {
- GIT_VERSION = unknown
-}
+GIT_VERSION = 1.3.0
+GIT_VERSION = 1.3.3
-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
-!equals(HAS_COMMIT, 0) {
- GIT_COMMIT = unknown
-}
+GIT_COMMIT = 01fcfec9
+GIT_COMMIT = bfce851d
-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
-!equals(HAS_TIMESTAMP, 0) {
- GIT_TIMESTAMP = 0
-}
+GIT_TIMESTAMP = 1679910698
+GIT_TIMESTAMP = 1699609231
DEFINES += APP_NAME=\\\"$$NAME\\\" \
APP_VERSION=\\\"$$GIT_VERSION\\\" \
--
2.39.2
2.43.2

63
net-wireless/qflipper/qflipper-1.3.0-r1.ebuild
View file

@ -1,63 +0,0 @@
# 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}"
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() {
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
}

4
net-wireless/qflipper/qflipper-1.3.3.ebuild → net-wireless/qflipper/qflipper-1.3.3-r1.ebuild
View file

@ -28,7 +28,7 @@ RDEPEND="
dev-qt/qtconcurrent:5=
dev-qt/qtcore:5=
dev-qt/qtdeclarative:5=
dev-qt/qtgui:5=
dev-qt/qtgui:5=[jpeg]
dev-qt/qtnetwork:5=
dev-qt/qtquickcontrols:5=
dev-qt/qtquickcontrols2:5=
@ -44,7 +44,7 @@ DEPEND="${RDEPEND}"
# https://github.com/flipperdevices/qFlipper/issues/213
PATCHES=(
"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
"${FILESDIR}/${PN}-1.3.0_display_version.patch"
"${FILESDIR}/${P}_display_version.patch"
"${FILESDIR}/${PN}-nanopb.patch"
)

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

@ -1,4 +1,4 @@
# Copyright 2023 Gentoo Authors
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -15,7 +15,7 @@ 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
@ -28,7 +28,7 @@ RDEPEND="
dev-qt/qtconcurrent:5=
dev-qt/qtcore:5=
dev-qt/qtdeclarative:5=
dev-qt/qtgui:5=
dev-qt/qtgui:5=[jpeg]
dev-qt/qtnetwork:5=
dev-qt/qtquickcontrols:5=
dev-qt/qtquickcontrols2:5=
@ -41,8 +41,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
# https://github.com/flipperdevices/qFlipper/issues/213
PATCHES=(
"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
"${FILESDIR}/${PN}-nanopb.patch"
)
src_configure() {