From 08274d52f0f32bc5c2bdd222874cb78145a69871 Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Sat, 4 Jan 2025 10:48:16 +0100 Subject: [PATCH 1/2] net-wireless/qflipper: remove Qt5 graphic environment support Signed-off-by: Thibaud CANALE --- .../qflipper/qflipper-1.3.3-r2.ebuild | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 net-wireless/qflipper/qflipper-1.3.3-r2.ebuild diff --git a/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild b/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild new file mode 100644 index 000000000..793bbb7c8 --- /dev/null +++ b/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 2024 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="" + +RDEPEND=" + >=dev-libs/nanopb-0.4.5[pb-malloc] + dev-qt/qtbase:6=[concurrent,evdev,gui,network,widgets] + dev-qt/qtdeclarative:6= + dev-qt/qtserialport:6= + dev-qt/qtshadertools:6= + dev-qt/qtsvg:6= + dev-qt/qttools:6= + dev-qt/qtwayland:6= + dev-qt/qt5compat:6= + sys-libs/zlib:= + virtual/libusb:1 +" +DEPEND="${RDEPEND}" + +# https://github.com/flipperdevices/qFlipper/issues/213 +PATCHES=( + "${FILESDIR}/${PN}-1.3.0_unbundle.patch" + "${FILESDIR}/${P}_display_version.patch" +) + +src_configure() { + local qmake_args=( + qFlipper.pro + PREFIX="${EPREFIX}/usr" + -spec linux-g++ + CONFIG+=qtquickcompiler + DEFINES+=DISABLE_APPLICATION_UPDATES + ) + eqmake6 "${qmake_args[@]}" +} + +src_compile() { + emake qmake_all # rebuild Makefiles in subdirs + emake +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install +} From 4523f699150e894b33ea4870499542ce2df36c33 Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Sat, 4 Jan 2025 11:03:11 +0100 Subject: [PATCH 2/2] net-wireless/qflipper: drop 9999, live ebuild Signed-off-by: Thibaud CANALE --- .../qflipper/qflipper-1.3.3-r1.ebuild | 11 +-- .../qflipper/qflipper-1.3.3-r2.ebuild | 11 +-- net-wireless/qflipper/qflipper-9999.ebuild | 80 ------------------- 3 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 net-wireless/qflipper/qflipper-9999.ebuild diff --git a/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild b/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild index 4eda59418..a82d0dbfb 100644 --- a/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild +++ b/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild @@ -11,14 +11,9 @@ 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 +KEYWORDS="~amd64 ~arm64 ~x86" +SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/qFlipper-${PV}" IUSE="+qt5 qt6" REQUIRED_USE="^^ ( qt5 qt6 )" diff --git a/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild b/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild index 793bbb7c8..0dac21e51 100644 --- a/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild +++ b/net-wireless/qflipper/qflipper-1.3.3-r2.ebuild @@ -11,14 +11,9 @@ 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 +KEYWORDS="~amd64 ~arm64 ~x86" +SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/qFlipper-${PV}" IUSE="" RDEPEND=" diff --git a/net-wireless/qflipper/qflipper-9999.ebuild b/net-wireless/qflipper/qflipper-9999.ebuild deleted file mode 100644 index bb5e8d044..000000000 --- a/net-wireless/qflipper/qflipper-9999.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2024 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 qt6" -REQUIRED_USE="^^ ( qt5 qt6 )" - -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=[jpeg] - dev-qt/qtnetwork:5= - dev-qt/qtquickcontrols:5= - dev-qt/qtquickcontrols2:5= - dev-qt/qtserialport:5= - dev-qt/qtsvg:5= - dev-qt/qtwidgets:5= - ) - qt6? ( - dev-qt/qtbase:6=[concurrent,evdev,gui,network,widgets] - dev-qt/qtdeclarative:6= - dev-qt/qtserialport:6= - dev-qt/qtshadertools:6= - dev-qt/qtsvg:6= - dev-qt/qttools:6= - dev-qt/qtwayland:6= - dev-qt/qt5compat:6= - ) - sys-libs/zlib:= - virtual/libusb:1 -" -DEPEND="${RDEPEND}" - -# https://github.com/flipperdevices/qFlipper/issues/213 -PATCHES=( - "${FILESDIR}/${PN}-1.3.0_unbundle.patch" -) - -src_configure() { - local qmake_args=( - qFlipper.pro - PREFIX="${EPREFIX}/usr" - -spec linux-g++ - CONFIG+=qtquickcompiler - DEFINES+=DISABLE_APPLICATION_UPDATES - ) - use qt5 && \ - eqmake5 "${qmake_args[@]}" - use qt6 && \ - eqmake6 "${qmake_args[@]}" -} - -src_compile() { - emake qmake_all # rebuild Makefiles in subdirs - emake -} - -src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install -}