From d2795e5cb5242f84f7279d9b58d5e3108f394102 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 22 Oct 2022 07:46:44 +0100 Subject: [PATCH 1/2] Fix build with GTK3 prior to 3.22.23. Those versions of GTK (or rather, GDK) don't support the GDK_WINDOW_STATE_TOP_TILED constants; they only support the non-directional GDK_WINDOW_STATE_TILED. And GTK < 3.10.0 doesn't even support that. All those constants were under #ifdef already; I've just made the ifdefs a bit more precise. --- unix/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unix/window.c b/unix/window.c index 1958edde..18cce475 100644 --- a/unix/window.c +++ b/unix/window.c @@ -2557,8 +2557,10 @@ static void request_resize_internal(GtkFrontend *inst, bool from_terminal, GdkWindowState state = gdk_window_get_state(gdkwin); if (state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN | -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,10,0) GDK_WINDOW_STATE_TILED | +#endif +#if GTK_CHECK_VERSION(3,22,23) GDK_WINDOW_STATE_TOP_TILED | GDK_WINDOW_STATE_RIGHT_TILED | GDK_WINDOW_STATE_BOTTOM_TILED | From 0c59d496837b6e6d7a1d416ef12ece3c38c7af08 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 22 Oct 2022 08:23:06 +0100 Subject: [PATCH 2/2] Update the pre-release-candidate testing checklist. Removed 'try cmake 3.7 on Windows': I think that's not really necessary, because Windows doesn't have the concept of an old overall distro that makes it hard to upgrade a particular build tool. On the other hand, added a big pile of other things I'd like not to forget. --- CHECKLST.txt | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/CHECKLST.txt b/CHECKLST.txt index a0611bec..3d618cbd 100644 --- a/CHECKLST.txt +++ b/CHECKLST.txt @@ -31,14 +31,26 @@ Things to do during the branch-stabilisation period: word XXX-REVIEW-BEFORE-RELEASE. (Any such comments should state clearly what needs to be done.) - - Do some testing of the Windows version with Minefield (you can - build a Minefield version using 'bob . XFLAGS=-DMINEFIELD'), and of - the Unix version with valgrind and/or Address Sanitiser. In - particular, any headline features for the release should get a - workout with memory checking enabled! + - Test the Unix build with Address Sanitiser. In particular, any + headline features for the release should get a workout with memory + checking enabled! - - Test the CMake build scripts with the oldest CMake they claim to - support, on both Unix and Windows. + - Test the Windows build with Address Sanitiser too (as of VS 2022). + + In the course of that, give a recent Windows pterm a try, to + make sure that still works. + + - Test building and running on old platforms: + + build on Debian stretch (containing CMake 3.7, the earliest + CMake we claim support for) + + build with all three major versions of GTK + + build the old-Windows binaries and test-run them on Win95 (PuTTY + proper even without WinSock2) + + - Check Coverity is happy. + + - Check the side-channel tester is happy. + + - Check all the non-SSH network backends still basically work. Making a release candidate build --------------------------------