Skip to content

Commit 870b749

Browse files
committed
patch 7.4.2092
Problem: GTK 3 build fails with older GTK version. Solution: Check the pango version. (Kazunobu Kuriyama)
1 parent 2e45d21 commit 870b749

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/gui_beval.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,9 @@ set_printable_label_text(GtkLabel *label, char_u *text)
10461046
guicolor_T pixel;
10471047
#if GTK_CHECK_VERSION(3,0,0)
10481048
GdkRGBA color = { 0.0, 0.0, 0.0, 1.0 };
1049+
# if PANGO_VERSION_CHECK(1,38,0)
10491050
PangoAttribute *attr_alpha;
1051+
# endif
10501052
#else
10511053
GdkColor color = { 0, 0, 0, 0 };
10521054
#endif
@@ -1115,8 +1117,10 @@ set_printable_label_text(GtkLabel *label, char_u *text)
11151117
DOUBLE2UINT16(color.red),
11161118
DOUBLE2UINT16(color.green),
11171119
DOUBLE2UINT16(color.blue));
1120+
# if PANGO_VERSION_CHECK(1,38,0)
11181121
attr_alpha = pango_attr_foreground_alpha_new(
11191122
DOUBLE2UINT16(color.alpha));
1123+
# endif
11201124
# undef DOUBLE2UINT16
11211125
#else
11221126
attr = pango_attr_foreground_new(
@@ -1126,9 +1130,11 @@ set_printable_label_text(GtkLabel *label, char_u *text)
11261130
attr->end_index = pdest - buf + outlen;
11271131
pango_attr_list_insert(attr_list, attr);
11281132
#if GTK_CHECK_VERSION(3,0,0)
1133+
# if PANGO_VERSION_CHECK(1,38,0)
11291134
attr_alpha->start_index = pdest - buf;
11301135
attr_alpha->end_index = pdest - buf + outlen;
11311136
pango_attr_list_insert(attr_list, attr_alpha);
1137+
# endif
11321138
#endif
11331139
}
11341140
pdest += outlen;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,8 @@ static char *(features[]) =
758758

759759
static int included_patches[] =
760760
{ /* Add new patch number below this line */
761+
/**/
762+
2092,
761763
/**/
762764
2091,
763765
/**/

0 commit comments

Comments
 (0)