patch 9.2.0012: Build fails when wayland is not defined

Problem:  Build fails when wayland is not defined
          (fjaell, after v9.2.0010)
Solution: Add ifdef GDK_WINDOWING_WAYLAND
          (Christoffer Aasted)

fixes:  #19429
closes: #19428

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

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index bfe65c053dd562f6508a26fdd0f41b1a28f87766..ac8aa0721cff7ce2ee6c95e07d7437f12b0e1187 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2097,8 +2097,7 @@ scroll_event(GtkWidget *widget,
     vim_modifiers = modifiers_gdk2mouse(event->state);
 
 #if GTK_CHECK_VERSION(3,4,0)
-    // on x11, despite not requested, when we copy into primary clipboard,
-    // we'll get smooth events. Unsmooth ones will also come along.
+# ifdef GDK_WINDOWING_WAYLAND
     if (event->direction == GDK_SCROLL_SMOOTH && gui.is_wayland)
     {
        while (acc_x >= 1.0)
@@ -2126,7 +2125,11 @@ scroll_event(GtkWidget *widget,
                    FALSE, vim_modifiers);
        }
     }
-    else if (event->direction == GDK_SCROLL_SMOOTH && X_DISPLAY)
+    else
+# endif
+    // on x11, despite not requested, when we copy into primary clipboard,
+    // we'll get smooth events. Unsmooth ones will also come along.
+    if (event->direction == GDK_SCROLL_SMOOTH && X_DISPLAY)
        // for X11 we deal with unsmooth events, and so ignore the smooth ones
        ;
     else

diff --git a/src/version.c b/src/version.c
index c60bce46b03b82386de279ff6d8a801e9936ceaf..fad148040442d787f634a309223e72d79e0a15a8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    12,
 /**/
     11,
 /**/