diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2018-12-12 15:58:37 -0600 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2018-12-12 15:58:37 -0600 |
| commit | 188f4cfdd763977704778011b707d67f0ccbc92f (patch) | |
| tree | af21874c890103328f628b2208e3c492b87ab50a | |
| parent | b9952a252de791ad6a5e1a72a3cc7a77f4482cdd (diff) | |
| download | pidgin-188f4cfdd763977704778011b707d67f0ccbc92f.tar.gz | |
Pidgin: Drop specific Pango dependency check
We depend on Pango >= 1.4 for decent RTL support. Our minimum Gtk
dependency of >= 3.10 depends on Pango >= 1.32.4. Therefore via
Gtk, we depend on a plenty high enough version automatically. This
patch removes the explicit check. It also removes the single set
of guards for this, though it's effectively commented out anyway.
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | pidgin/gtkconv.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 83df56e624..4d0d6cadae 100644 --- a/meson.build +++ b/meson.build @@ -299,9 +299,6 @@ enable_gestures = get_option('gestures') # ####################################################################### 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') diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index e6943b76fa..965fa5878a 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -6344,7 +6344,6 @@ static void pidgin_conv_calculate_newday(PidginConversation *gtkconv, time_t mti static void str_embed_direction_chars(char **str) { -#ifdef HAVE_PANGO14 char pre_str[4]; char post_str[10]; char *ret; @@ -6372,7 +6371,6 @@ str_embed_direction_chars(char **str) g_free(*str); *str = ret; -#endif } #endif |