patch 9.2.0685: clipboard.c does not get the Wayland CFLAGS on GTK2

Problem:  clipboard.c relies on the GTK include flags from
          pkg-config to pull in the Wayland headers.  This is not
          guaranteed: GTK2 does not add them, and Wayland clipboard
          support is independent of the GUI.
Solution: Add $(WAYLAND_CFLAGS) and $(WAYLAND_CPPFLAGS) to the
          clipboard.c compile rule so it always compiles, consistent
          with the other Wayland files (Christoffer Aasted).

closes: #20576

Signed-off-by: Christoffer Aasted <dezzadk@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index ef0cb8553568d784a7005f8fb78b24156d21d8da..89e023c9d05adfa1d4d77e8cd9f8fe716c44bd0c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3287,7 +3287,7 @@ objects/clientserver.o: clientserver.c
        $(CCC) -o $@ clientserver.c
 
 objects/clipboard.o: clipboard.c $(WAYLAND_SRC)
-       $(CCC) -o $@ clipboard.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ clipboard.c
 
 objects/cmdexpand.o: cmdexpand.c
        $(CCC) -o $@ cmdexpand.c

diff --git a/src/version.c b/src/version.c
index 9fba8ef19cc72bba11d82b5b6d40dfe663eae7ef..3f925d14753b3d9d5e18cacdc852be95bbff28a3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    685,
 /**/
     684,
 /**/