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

net-wireless/qflipper: add jpeg dependency, issue #1446

Browse source 
Also fix displayed version.

Closes: https://github.com/pentoo/pentoo-overlay/issues/1446
Signed-off-by: Thibaud CANALE <thican@thican.net>
This commit is contained in:
Thibaud CANALE 2024-04-02 01:06:27 +02:00
parent ffe7e9db72
commit 6d9b6e0031
No known key found for this signature in database
GPG key ID: 52F5127650733A18
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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() {