patch 9.1.1658: Missing includes for Wayland headers

Problem:  Missing includes for Wayland headers, when subfolder is used
          (after v9.1.1644)
Solution: Add new $WAYLAND_CPPFLAGS (Christoffer Aasted).

closes: #18051

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 32c0d97d1851e62b7bd64d7719880bc7dfd2ab3f..d1b08be257d01757287d5bfa3a7fd77637fdb35e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3658,19 +3658,19 @@ objects/window.o: window.c
        $(CCC) -o $@ window.c
 
 objects/wayland.o: wayland.c
-       $(CCC) $(WAYLAND_CFLAGS) -o $@ wayland.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ wayland.c
 
 objects/wlr-data-control-unstable-v1.o: auto/wayland/wlr-data-control-unstable-v1.c
-       $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/wlr-data-control-unstable-v1.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/wlr-data-control-unstable-v1.c
 
 objects/ext-data-control-v1.o: auto/wayland/ext-data-control-v1.c
-       $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/ext-data-control-v1.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/ext-data-control-v1.c
 
 objects/xdg-shell.o: auto/wayland/xdg-shell.c
-       $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/xdg-shell.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/xdg-shell.c
 
 objects/primary-selection-unstable-v1.o: auto/wayland/primary-selection-unstable-v1.c
-       $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/primary-selection-unstable-v1.c
+       $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/primary-selection-unstable-v1.c
 
 objects/netbeans.o: netbeans.c
        $(CCC) -o $@ netbeans.c

diff --git a/src/config.mk.in b/src/config.mk.in
index 78b207ef765e49c2bc2d94f1d0a6b331086bf9f6..a46a140a7143c7124e6f1d92bedd2adb3f10e0ef 100644 (file)
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -37,10 +37,11 @@ X_PRE_LIBS  = @X_PRE_LIBS@
 X_EXTRA_LIBS   = @X_EXTRA_LIBS@
 X_LIBS         = @X_LIB@
 
-WAYLAND_LIBS    = @WAYLAND_LIBS@
-WAYLAND_SRC    = @WAYLAND_SRC@
-WAYLAND_OBJ    = @WAYLAND_OBJ@
-WAYLAND_CFLAGS    = @WAYLAND_CFLAGS@
+WAYLAND_LIBS       = @WAYLAND_LIBS@
+WAYLAND_SRC            = @WAYLAND_SRC@
+WAYLAND_OBJ            = @WAYLAND_OBJ@
+WAYLAND_CFLAGS     = @WAYLAND_CFLAGS@
+WAYLAND_CPPFLAGS    = @WAYLAND_CPPFLAGS@
 
 XDIFF_OBJS_USED        = @XDIFF_OBJS_USED@
 

diff --git a/src/version.c b/src/version.c
index 2a4cd751503719aefbd370af8b1eaf872dccf6bc..4d2aa59ccc3fc683ec587105a7564b72ed9eba84 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1658,
 /**/
     1657,
 /**/