patch 9.2.0859: GTK2: Link error

Problem:  GTK2: Link error (after v9.2.0853)
Solution: Adjust ifdef and include only when using at least GTK 3.10
          (Olaf Seibert)

Error message:
ld: objects/gui_gtk_x11.o: in function `gui_mch_init':
gui_gtk_x11.c:(.text+0x33f1): undefined reference to `gtk_widget_get_scale_factor'
link.sh: Linking failed
*** Error code 1

closes: #20857

Signed-off-by: Olaf Seibert <rhialto@falu.nl>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 1291919b29f60d7c30ae49d1eddea24999b3ae05..0647d9b16b37f61d9a019ba434ecb3f0d2b5eeea 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4299,7 +4299,7 @@ gui_mch_init(void)
                           G_CALLBACK(gtk_settings_xft_dpi_changed_cb), NULL);
     }
 
-#ifdef FEAT_IMAGE
+#if defined(FEAT_IMAGE) && GTK_CHECK_VERSION(3,10,0)
     gui.scale = gtk_widget_get_scale_factor(gui.formwin);
 #endif
 

diff --git a/src/version.c b/src/version.c
index 8dcb28fb007796d2f6e97fe9d336c28a01047e55..01b586bebf71d3f5b015c8f1e3a6543062a3998e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    859,
 /**/
     858,
 /**/