Attachment 21334 Details for Bug 55213 – qgroundcontrol.spec.patch

[patch] qgroundcontrol.spec.patch

0001-5.0.8-alt6.patch (text/plain), 4.73 KB, created by Michael Shigorin on 2026-05-12 20:29:01 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2026-05-12 20:29:01 MSK

Size: 4.73 KB

patch

obsolete

>From d7d80f30775131a9cad3cd877f603aa00717832d Mon Sep 17 00:00:00 2001
>From: Ilya Kurdyukov <ilyakurdyukov@altlinux.org>
>Date: Tue, 12 May 2026 20:07:06 +0300
>Subject: [PATCH] 5.0.8-alt6
>
>- e2k build fix and spec cleanup
>---
> .gear/qgroundcontrol.spec | 84 +++++++++++++++++++++------------------
> 1 file changed, 46 insertions(+), 38 deletions(-)
>
>diff --git a/.gear/qgroundcontrol.spec b/.gear/qgroundcontrol.spec
>index feab882b9..4de5df797 100644
>--- a/.gear/qgroundcontrol.spec
>+++ b/.gear/qgroundcontrol.spec
>@@ -2,7 +2,7 @@
> 
> Name: qgroundcontrol
> Version: 5.0.8
>-Release: alt5
>+Release: alt6
> 
> Summary: Ground Control Station (GCS) designed for UAVs
> License: Apache-2.0
>@@ -28,6 +28,9 @@ Requires: libOpenGL
> BuildRequires(pre): rpm-macros-cmake
> BuildRequires: cmake
> BuildRequires: gcc gcc-c++
>+%ifarch %e2k
>+BuildRequires: clang
>+%endif
> BuildRequires: packagekit-qt6-devel
> BuildRequires: qt6-charts-devel
> BuildRequires: qt6-5compat-devel
>@@ -66,11 +69,12 @@ BuildRequires: zlib-devel
> BuildRequires: libmount-devel
> BuildRequires: libblkid-devel
> BuildRequires: libselinux-devel
>+%ifnarch %e2k
> BuildRequires: libunwind-devel
>+%endif
> BuildRequires: libSDL2-devel
> BuildRequires: libSDL3-devel
> BuildRequires: libsystemd-devel
>-BuildRequires: patchelf
> BuildRequires: libsoundio-devel
> BuildRequires: libpulseaudio-devel
> BuildRequires: libwayland-client-devel
>@@ -110,51 +114,55 @@ mission planning, making it the go-to solution for any MAVLink-enabled drone.
> cp -r %_datadir/ParameterRepository/* src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository/
> 
> %build
>-export LC_ALL=ru_RU.UTF-8
>-qt-cmake-qt6 -B build -G Ninja \
>-            -DCMAKE_BUILD_TYPE=Release \
>-            -DCMAKE_PROJECT_INCLUDE=%SOURCE1 \
>-            -DCMAKE_SKIP_INSTALL_RPATH=ON \
>-            -DCMAKE_INSTALL_RPATH="%_libdir" \
>-            -DCMAKE_PREFIX_PATH=%_libdir/cmake/ \
>-            -DBUILD_SHARED_LIBS=ON \
>-            -DLIB_PREFIX=%_libdir \
>-            -DLIB_DIR_NAME=%_lib \
>-            -DUSE_SYSTEM_ULOG_CPP=ON \
>-            -DUSE_SYSTEM_QMDNSENGINE=ON \
>-            -DUSE_SYSTEM_PX4-GPSDRIVERS=ON \
>-            -DUSE_SYSTEM_SDL_GAMECONTROLLERDB=ON \
>-            -DUSE_SYSTEM_SDL2=ON \
>-            -DUSE_SYSTEM_MAVLINK=ON \
>-            -DUSE_SYSTEM_LIBEVENTS=ON \
>-            -DUSE_SYSTEM_ZLIB=ON \
>-            -DUSE_SYSTEM_XZ-EMBEDDED=ON \
>-            -DUSE_SYSTEM_GEOGRAPHICLIB=ON \
>-            -DUSE_SYSTEM_SHAPE=ON \
>-            -DUSE_SYSTEM_GSTQML6=ON \
>-            #
>-
>-cmake --build build --config Release
>-patchelf --set-rpath '' build/Release/QGroundControl # Clear wrong paths in rpath.
>+export LC_ALL=C.UTF-8
>+export QTDIR=%_qt6_prefix
>+export PATH="%{_qt6_bindir}:$PATH"
>+%cmake \
>+%ifarch %e2k
>+	-DCMAKE_C{_COMPILER=clang,XX_COMPILER=clang++} \
>+	-DCMAKE_C{,XX}_FLAGS_RELEASE="-O2 -g -DNDEBUG" \
>+%endif
>+	-DCMAKE_AUTOGEN_PARALLEL=%__nprocs \
>+	-DCMAKE_BUILD_TYPE=Release \
>+	-DCMAKE_PROJECT_INCLUDE=%SOURCE1 \
>+	-DCMAKE_BUILD_RPATH:STRING='' \
>+	-DCMAKE_SKIP_INSTALL_RPATH=ON \
>+	-DCMAKE_PREFIX_PATH=%_libdir/cmake/ \
>+	-DBUILD_SHARED_LIBS=ON \
>+	-DLIB_PREFIX=%_libdir \
>+	-DLIB_DIR_NAME=%_lib \
>+	-DUSE_SYSTEM_ULOG_CPP=ON \
>+	-DUSE_SYSTEM_QMDNSENGINE=ON \
>+	-DUSE_SYSTEM_PX4-GPSDRIVERS=ON \
>+	-DUSE_SYSTEM_SDL_GAMECONTROLLERDB=ON \
>+	-DUSE_SYSTEM_SDL2=ON \
>+	-DUSE_SYSTEM_MAVLINK=ON \
>+	-DUSE_SYSTEM_LIBEVENTS=ON \
>+	-DUSE_SYSTEM_ZLIB=ON \
>+	-DUSE_SYSTEM_XZ-EMBEDDED=ON \
>+	-DUSE_SYSTEM_GEOGRAPHICLIB=ON \
>+	-DUSE_SYSTEM_SHAPE=ON \
>+	-DUSE_SYSTEM_GSTQML6=ON \
>+	#
>+
>+%cmake_build
> 
> %install
>-mkdir -pv %buildroot
>-mkdir -pv %buildroot%_bindir
>-install -Dm 755 build/Release/QGroundControl %buildroot%_bindir/QGroundControl
>-
>-mkdir -pv %buildroot%_datadir/applications
>-install -Dm 644 build/org.mavlink.qgroundcontrol.desktop %buildroot%_datadir/applications/org.mavlink.qgroundcontrol.desktop
>-
>-install -Dm 644 resources/icons/qgroundcontrol.png %buildroot/%_datadir/icons/hicolor/128x128/apps/QGroundControl.png
>+install -Dm 755 {%_cmake__builddir/Release,%buildroot%_bindir}/QGroundControl
>+install -Dm 644 {%_cmake__builddir,%buildroot%_desktopdir}/org.mavlink.qgroundcontrol.desktop
>+install -Dm 644 resources/icons/qgroundcontrol.png %buildroot/%_iconsdir/hicolor/128x128/apps/QGroundControl.png
> 
> %find_lang --without-mo --with-qt qgc
> 
> %files -f qgc.lang
> %_bindir/QGroundControl
>-%_datadir/applications/org.mavlink.qgroundcontrol.desktop
>-%_datadir/icons/hicolor/128x128/apps/QGroundControl.png
>+%_desktopdir/org.mavlink.qgroundcontrol.desktop
>+%_iconsdir/hicolor/*/apps/QGroundControl.png
> 
> %changelog
>+* Tue May 12 2026 Ilya Kurdyukov <ilyakurdyukov@altlinux.org> 5.0.8-alt6
>+- e2k build fix and spec cleanup
>+
> * Thu Apr 23 2026 Ilya Muhamadeev <nicourced@altlinux.org> 5.0.8-alt5
> - Replace Yandex Tiles with Esri, MapTiler, Stadia providers;
> - Add libcurl tile downloader.
>-- 
>2.50.1
>

Actions: View | Diff

Attachments on bug 55213: 19092 | 19109 | 19110 | 19273 | 19276 | 19278 | 21334