Control: tags 1112854 + patch Dear maintainer,
I've prepared an NMU for doomsday (versioned as 2.3.1+ds1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for doomsday-2.3.1+ds1 doomsday-2.3.1+ds1 changelog | 9 +++ patches/0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch | 26 +++++++++++ patches/series | 1 rules | 3 - 4 files changed, 38 insertions(+), 1 deletion(-) diff -Nru doomsday-2.3.1+ds1/debian/changelog doomsday-2.3.1+ds1/debian/changelog --- doomsday-2.3.1+ds1/debian/changelog 2021-09-08 00:23:34.000000000 +0300 +++ doomsday-2.3.1+ds1/debian/changelog 2025-10-30 19:32:32.000000000 +0200 @@ -1,3 +1,12 @@ +doomsday (2.3.1+ds1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Workaround FTBFS with CMake 4. (Closes: #1112854) + * Add workaround from Bernhard Übelacker for running + under Wayland. (Closes: #1113738) + + -- Adrian Bunk <[email protected]> Thu, 30 Oct 2025 19:32:32 +0200 + doomsday (2.3.1+ds1-1) unstable; urgency=medium * Team upload. diff -Nru doomsday-2.3.1+ds1/debian/patches/0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch doomsday-2.3.1+ds1/debian/patches/0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch --- doomsday-2.3.1+ds1/debian/patches/0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch 1970-01-01 02:00:00.000000000 +0200 +++ doomsday-2.3.1+ds1/debian/patches/0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch 2025-10-30 19:32:32.000000000 +0200 @@ -0,0 +1,26 @@ +diff --git a/doomsday/apps/client/src/main_client.cpp b/doomsday/apps/client/src/main_client.cpp +index 077cb0b..11d4ec8 100644 +--- a/doomsday/apps/client/src/main_client.cpp ++++ b/doomsday/apps/client/src/main_client.cpp +@@ -47,6 +47,7 @@ + + #include <QDebug> + #include <QMessageBox> ++#include <QtGlobal> + #include <QTranslator> + #include <de/EscapeParser> + +@@ -86,6 +87,13 @@ DENG2_IMPORT_LIBRARY(doom) + */ + int main(int argc, char **argv) + { ++ // Avoid crash, https://bugs.debian.org/1113738 ++ auto platform = qgetenv("QT_QPA_PLATFORM"); ++ if (qgetenv("QT_QPA_PLATFORM").isEmpty()) { ++ if (qEnvironmentVariableIsSet("WAYLAND_DISPLAY") && qEnvironmentVariableIsSet("DISPLAY")) { ++ qputenv("QT_QPA_PLATFORM", "xcb"); ++ } ++ } + int exitCode = 0; + { + ClientApp::setDefaultOpenGLFormat(); diff -Nru doomsday-2.3.1+ds1/debian/patches/series doomsday-2.3.1+ds1/debian/patches/series --- doomsday-2.3.1+ds1/debian/patches/series 2021-09-07 23:11:57.000000000 +0300 +++ doomsday-2.3.1+ds1/debian/patches/series 2025-10-30 19:32:32.000000000 +0200 @@ -1,2 +1,3 @@ 0001-cmake-Macros.cmake-Disable-RPATH.patch 0002-.desktop-Install-executables-into-usr-games.patch +0003-1113738-wayland-crash_set-QT_QPA_PLATFORM.patch diff -Nru doomsday-2.3.1+ds1/debian/rules doomsday-2.3.1+ds1/debian/rules --- doomsday-2.3.1+ds1/debian/rules 2021-09-07 23:59:48.000000000 +0300 +++ doomsday-2.3.1+ds1/debian/rules 2025-10-30 19:32:32.000000000 +0200 @@ -18,4 +18,5 @@ dh_auto_configure -- \ -DDENG_ASSIMP_EMBEDDED:BOOL=OFF \ -DDENG_BUILD=$(DEB_VERSION) \ - -DCMAKE_INSTALL_BINDIR=games + -DCMAKE_INSTALL_BINDIR=games \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5
