Source: flightgear Version: 1:2024.1.4+dfsg-1 Severity: normal Tags: patch X-Debbugs-Cc: [email protected], Dr. Tobias Quathamer <[email protected]> User: [email protected] Usertags: armhf
This is no longer needed after the switch to Qt6. diff -Nru flightgear-2024.1.4+dfsg/debian/control flightgear-2024.1.4+dfsg/debian/control --- flightgear-2024.1.4+dfsg/debian/control 2026-02-05 08:47:01.000000000 +0000 +++ flightgear-2024.1.4+dfsg/debian/control 2026-02-05 08:47:16.000000000 +0000 @@ -33,10 +33,10 @@ libudev-dev [linux-any], libudns-dev, libx11-dev, - qt6-base-dev [!armel !armhf], - qt6-base-private-dev [!armel !armhf], - qt6-declarative-dev [!armel !armhf], - qt6-declarative-private-dev [!armel !armhf], + qt6-base-dev, + qt6-base-private-dev, + qt6-declarative-dev, + qt6-declarative-private-dev, qt6-svg-dev, qt6-tools-dev, zlib1g-dev, diff -Nru flightgear-2024.1.4+dfsg/debian/rules flightgear-2024.1.4+dfsg/debian/rules --- flightgear-2024.1.4+dfsg/debian/rules 2026-01-17 12:05:30.000000000 +0000 +++ flightgear-2024.1.4+dfsg/debian/rules 2026-02-05 08:47:16.000000000 +0000 @@ -17,17 +17,6 @@ DEB_TARGET_ARCH ?= $(shell dpkg-architecture -qDEB_TARGET_ARCH) DEFAULT_BUILD_DIRECTORY = obj-$(shell dpkg-architecture -q DEB_HOST_GNU_TYPE) -# Do not enable Qt on armel and armhf. -# libqt5opengl uses OpenGL ES on armel+armhf, -# simgear/flightgear use full OpenGL on all -# architectures, and the two can't be mixed. -# See https://bugs.debian.org/895332 -ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf)) - ENABLE_QT = OFF -else - ENABLE_QT = ON -endif - # Take care of excess precision of the x87 FPU. # See https://bugs.debian.org/963200 ifneq (,$(filter $(DEB_HOST_ARCH), i386)) @@ -46,7 +35,7 @@ -DFG_DATA_DIR:PATH=/usr/share/games/flightgear \ -DENABLE_LARCSIM=ON \ -DENABLE_UIUC_MODEL=ON \ - -DENABLE_QT=$(ENABLE_QT) \ + -DENABLE_QT=ON \ -DSP_FDMS=ON \ -DSYSTEM_SQLITE=ON \ -DSYSTEM_SPEEX=ON
