changeset
Merged in default (pull request #452)
Fri, 14 Dec 2018 08:06:02 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 14 Dec 2018 08:06:02 +0000
- changeset 39379
- f63983e956f1
- parent 39377
- c84d810de0a4 (current diff)
- parent 39378
- df5d8d5369a5 (diff)
- child 39381
- 339b307b3e0b
Merged in default (pull request #452)
Pidgin: Drop specific Pango dependency check
Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
Approved-by: Eion Robb
| meson.build | file | annotate | diff | comparison | revisions | |
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- a/meson.build Fri Dec 14 08:03:43 2018 +0000 +++ b/meson.build Fri Dec 14 08:06:02 2018 +0000 @@ -298,9 +298,6 @@ # ####################################################################### if get_option('gtkui') gtk = dependency('gtk+-3.0', version : '>= 3.10.0') - # We only really need Pango >= 1.4 for decent RTL support - pango = dependency('pango', version : '>= 1.4.0') - conf.set('HAVE_PANGO14', pango.found()) webkit = dependency('webkitgtk-3.0', version : '>= 1.3.7') talkatu = dependency('talkatu', version: '>=0.1.0')
--- a/pidgin/gtkconv.c Fri Dec 14 08:03:43 2018 +0000 +++ b/pidgin/gtkconv.c Fri Dec 14 08:06:02 2018 +0000 @@ -6342,7 +6342,6 @@ static void str_embed_direction_chars(char **str) { -#ifdef HAVE_PANGO14 char pre_str[4]; char post_str[10]; char *ret; @@ -6370,7 +6369,6 @@ g_free(*str); *str = ret; -#endif } #endif
