Raise dependency to cairo 1.14.4.

With the recent cairo bugfix, we can now switch to using cairo for
rendering i3bar per default by raising the minimum version of cairo
to 1.14.4, if this cairo version is available.

resolves #2048

diff --git a/DEPENDS b/DEPENDS
index 0882f1475be4ac96afaefb1611f7b94b42086ddf..fad11da54e9dcd12578e0483651533662818b71b 100644 (file)
--- a/DEPENDS
+++ b/DEPENDS
@@ -24,7 +24,7 @@
 │ PCRE         │ 8.12   │ 8.35   │ http://www.pcre.org/                   │
 │ libsn¹       │ 0.10   │ 0.12   │ http://freedesktop.org/wiki/Software/startup-notification
 │ pango        │ 1.30.0 | 1.36.8 │ http://www.pango.org/                  │
-│ cairo        │ 1.12.2 │ 1.14.0 │ http://cairographics.org/              │
+│ cairo        │ 1.14.4 │ 1.14.4 │ http://cairographics.org/              │
 └──────────────┴────────┴────────┴────────────────────────────────────────┘
  ¹ libsn = libstartup-notification
  ² Pod::Simple is a Perl module required for converting the testsuite

diff --git a/common.mk b/common.mk
index d28750426bd4864bf9830d7485dadbc3bed4e1b1..60be830e315ae2cd08b5762c2bc9731e9bd4d0de 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -141,6 +141,9 @@ LIBSN_LIBS   := $(call ldflags_for_lib, libstartup-notification-1.0,startup-noti
 PANGO_CFLAGS := $(call cflags_for_lib, cairo)
 PANGO_CFLAGS += $(call cflags_for_lib, pangocairo)
 I3_CPPFLAGS  += -DPANGO_SUPPORT=1
+ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.14.4 cairo 2>/dev/null && echo 1),1)
+I3_CPPFLAGS  += -DI3BAR_CAIRO=1
+endif
 PANGO_LIBS   := $(call ldflags_for_lib, cairo)
 PANGO_LIBS   += $(call ldflags_for_lib, pangocairo)