diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-22 22:26:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-22 22:26:52 +0200 |
| commit | 870b749ce1db1cec80f0f3766064a031688e6a46 (patch) | |
| tree | c0b0a7a6abf06aae2fa5a528525839df578a93e7 /src | |
| parent | 2e45d21c819272051f7ef4436f483e4b2ecfb369 (diff) | |
| download | vim-870b749ce1db1cec80f0f3766064a031688e6a46.zip | |
patch 7.4.2092
Problem: GTK 3 build fails with older GTK version.
Solution: Check the pango version. (Kazunobu Kuriyama)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_beval.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
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 @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2092, +/**/ 2091, /**/ 2090, |