From 2b3acded689b3de89e99e8a35f327fc5a1a92c85 Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Sun, 10 Nov 2019 23:52:11 +0100 Subject: [PATCH] Fix build with unstable release of Pango --- configure.ac.in | 1 + thunar/Makefile.am | 4 +++- thunar/thunar-pango-extensions.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index d46a2567..86f482f7 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -156,6 +156,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-3], [4.12.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) +XDT_CHECK_PACKAGE([PANGO], [pango], [1.42.0]) dnl ****************************** dnl *** GObject Instrospection *** diff --git a/thunar/Makefile.am b/thunar/Makefile.am index 3ee90a22..e0df6c4f 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -229,6 +229,7 @@ thunar_CFLAGS = \ $(LIBSM_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(XFCONF_CFLAGS) \ + $(PANGO_CFLAGS) \ $(PLATFORM_CFLAGS) thunar_LDFLAGS = \ @@ -245,7 +246,8 @@ thunar_LDADD = \ $(LIBNOTIFY_LIBS) \ $(LIBSM_LIBS) \ $(LIBXFCE4UI_LIBS) \ - $(XFCONF_LIBS) + $(XFCONF_LIBS) \ + $(PANGO_LIBS) thunar_DEPENDENCIES = \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la diff --git a/thunar/thunar-pango-extensions.c b/thunar/thunar-pango-extensions.c index 3ff6262c..07af8095 100644 --- a/thunar/thunar-pango-extensions.c +++ b/thunar/thunar-pango-extensions.c @@ -133,7 +133,7 @@ thunar_pango_attr_disable_hyphens (void) { static PangoAttrList *attr_list = NULL; -#ifdef PANGO_VERSION_1_44 +#if PANGO_VERSION_CHECK (1, 44, 0) if (G_UNLIKELY (attr_list == NULL)) attr_list = thunar_pango_attr_list_wrap (pango_attr_insert_hyphens_new (FALSE), NULL); #endif -- 2.21.0