From 870b749ce1db1cec80f0f3766064a031688e6a46 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 22 Jul 2016 22:26:52 +0200 Subject: [PATCH] patch 7.4.2092 Problem: GTK 3 build fails with older GTK version. Solution: Check the pango version. (Kazunobu Kuriyama) --- src/gui_beval.c | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/gui_beval.c b/src/gui_beval.c index 74da90893..9800c5308 100644 --- 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 f7eb5ceea..55054968e 100644 --- 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, /**/ -- 2.40.0