patch 7.4.2092

Problem:    GTK 3 build fails with older GTK version.
Solution:   Check the pango version. (Kazunobu Kuriyama)

diff --git a/src/gui_beval.c b/src/gui_beval.c
index 74da90893e5f6d2ed80f940914bfdace74c8fe51..9800c5308cfc787ac77e2758e98d827a670b32ca 100644 (file)
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1046,7 +1046,9 @@ set_printable_label_text(GtkLabel *label, char_u *text)
        guicolor_T      pixel;
 #if GTK_CHECK_VERSION(3,0,0)
        GdkRGBA         color = { 0.0, 0.0, 0.0, 1.0 };
+# if PANGO_VERSION_CHECK(1,38,0)
        PangoAttribute  *attr_alpha;
+# endif
 #else
        GdkColor        color = { 0, 0, 0, 0 };
 #endif
@@ -1115,8 +1117,10 @@ set_printable_label_text(GtkLabel *label, char_u *text)
                                DOUBLE2UINT16(color.red),
                                DOUBLE2UINT16(color.green),
                                DOUBLE2UINT16(color.blue));
+# if PANGO_VERSION_CHECK(1,38,0)
                        attr_alpha = pango_attr_foreground_alpha_new(
                                DOUBLE2UINT16(color.alpha));
+# endif
 # undef DOUBLE2UINT16
 #else
                        attr = pango_attr_foreground_new(
@@ -1126,9 +1130,11 @@ set_printable_label_text(GtkLabel *label, char_u *text)
                        attr->end_index   = pdest - buf + outlen;
                        pango_attr_list_insert(attr_list, attr);
 #if GTK_CHECK_VERSION(3,0,0)
+# if PANGO_VERSION_CHECK(1,38,0)
                        attr_alpha->start_index = pdest - buf;
                        attr_alpha->end_index   = pdest - buf + outlen;
                        pango_attr_list_insert(attr_list, attr_alpha);
+# endif
 #endif
                    }
                    pdest += outlen;

diff --git a/src/version.c b/src/version.c
index f7eb5ceea46dd34b24c01dd041ccc651a1b0fd96..55054968e3bbfd3a5ef9a9920f8c5f4169dbad62 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 */
+/**/
+    2092,
 /**/
     2091,
 /**/