From 82a641d8a79eb775d98ebcec1ba6aec77875d595 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Fri, 3 Nov 2017 20:00:50 -0500 Subject: [PATCH] Fix deprecated pango code always being used in glfont.cpp The version check to see if the non-deprecated API is available, PANGO_VERSION_CHECK(1,22,0), always returns false if pango-features.h isn't included. This is because PANGO_VERSION_MAJOR, _MINOR, _MICRO are not defined and are evaluated as 0 in the preprocessor code. This commit fixes compiling on Debian 8 using libpango1.0-dev 1.36.8. It was failing because deprecated function pango_ft2_get_context() was not available (hidden in header file by PANGO_DISABLE_DEPRECATED). --- libs/gtkutil/glfont.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index 09211a05..e0d7f3ee 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -174,6 +174,7 @@ GLFont *glfont_create( const char* font_string ){ // new font code ripped from ZeroRadiant #include +#include #include class GLFontInternal : public GLFont -- 2.39.2