nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-01 11:12:50 -05:00
Code Issues Projects Releases Wiki Activity

Fix build failure on Debian bullseye from last commit.

Browse Source 
Jacob reports that bullseye objected to the change from
G_APPLICATION_FLAGS_NONE to G_APPLICATION_DEFAULT_FLAGS, on the
grounds that it only has the former defined. Sigh. Added a cmake
check.
This commit is contained in:
Simon Tatham 2024-09-08 19:02:44 +01:00
parent 52bb6a3fe2
commit 109c60b3bf
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/cmake.h.in
View File

@ -48,6 +48,7 @@
#cmakedefine01 HAVE_BINARY_SETPGRP #cmakedefine01 HAVE_BINARY_SETPGRP
#cmakedefine01 HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE #cmakedefine01 HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
#cmakedefine01 HAVE_PANGO_FONT_MAP_LIST_FAMILIES #cmakedefine01 HAVE_PANGO_FONT_MAP_LIST_FAMILIES
#cmakedefine01 HAVE_G_APPLICATION_DEFAULT_FLAGS
#cmakedefine01 HAVE_AES_NI #cmakedefine01 HAVE_AES_NI
#cmakedefine01 HAVE_SHA_NI #cmakedefine01 HAVE_SHA_NI

4
cmake/gtk.cmake
View File

@ -84,6 +84,10 @@ if(GTK_FOUND)
${HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE} PARENT_SCOPE) ${HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE} PARENT_SCOPE)
set(HAVE_PANGO_FONT_MAP_LIST_FAMILIES set(HAVE_PANGO_FONT_MAP_LIST_FAMILIES
${HAVE_PANGO_FONT_MAP_LIST_FAMILIES} PARENT_SCOPE) ${HAVE_PANGO_FONT_MAP_LIST_FAMILIES} PARENT_SCOPE)
check_c_source_compiles("
#include <gtk/gtk.h>
int f = G_APPLICATION_DEFAULT_FLAGS;
int main(void) {}" HAVE_G_APPLICATION_DEFAULT_FLAGS)
endfunction() endfunction()
pango_check_subscope() pango_check_subscope()
endif() endif()

4
unix/gtkcompat.h
View File

@ -218,3 +218,7 @@
gdk_cursor_new_for_display(gdk_display_get_default(), cur) gdk_cursor_new_for_display(gdk_display_get_default(), cur)
#endif /* 3.0 */ #endif /* 3.0 */
#if !HAVE_G_APPLICATION_DEFAULT_FLAGS
#define G_APPLICATION_DEFAULT_FLAGS G_APPLICATION_FLAGS_NONE
#endif

1
unix/main-gtk-application.c
View File

@ -79,6 +79,7 @@ https://wiki.gnome.org/Projects/GTK%2B/OSX/Bundling has some links.
#include "putty.h" #include "putty.h"
#include "gtkmisc.h" #include "gtkmisc.h"
#include "gtkcompat.h"
char *x_get_default(const char *key) { return NULL; } char *x_get_default(const char *key) { return NULL; }