From 4255ba7ff4a075baef6afdb2de76833d8ed6b140 Mon Sep 17 00:00:00 2001 From: Christoffer Aasted Date: Mon, 16 Feb 2026 21:39:57 +0000 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- src/gui_gtk_x11.c | 9 ++++++--- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index bfe65c053d..ac8aa0721c 100644 --- 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 c60bce46b0..fad1480404 100644 --- 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, /**/