File Fix-build-with-pango-1.4.patch of Package kde-gtk-config4

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-build-with-pango-1.4.patch of Package kde-gtk-config4

From cf8db4ebe5ef5e54517604cd9330535983e4dff0 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Sat, 24 Aug 2019 20:00:01 +0200
Subject: Fix build with pango 1.44

pango>=1.44 headers depend on harfbuzz ones, make sure cmake can find them and pass the right include dir to the compiler

Differential Revision: https://phabricator.kde.org/D22832
---
 cmake/modules/FindGTK3.cmake | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
index f178523..b5a6efb 100644
--- a/cmake/modules/FindGTK3.cmake
+++ b/cmake/modules/FindGTK3.cmake
@@ -87,6 +87,24 @@ FIND_LIBRARY(
 	HINTS ${PC_PANGO_LIBDIR} ${PC_PANGO_LIBRARY_DIRS})
 
 #
+# harfbuzz
+#
+if(PC_PANGO_VERSION VERSION_EQUAL 1.44 OR PC_PANGO_VERSION VERSION_GREATER 1.44)
+    PKG_CHECK_MODULES(PC_HARFBUZZ REQUIRED harfbuzz)
+
+    SET(HARFBUZZ_DEFINITIONS ${PC_HARFBUZZ_CXXFLAGS_OTHER})
+
+    FIND_PATH(
+            HARFBUZZ_INCLUDE_DIR hb.h
+            HINTS ${PC_HARFBUZZ_INCLUDEDIR} ${PC_HARFBUZZ_INCLUDE_DIRS}
+            PATH_SUFFIXES harfbuzz)
+
+    FIND_LIBRARY(
+            HARFBUZZ_LIBRARY NAMES harfbuzz
+            HINTS ${PC_HARFBUZZ_LIBDIR} ${PC_HARFBUZZ_LIBRARY_DIRS})
+endif()
+
+#
 # cairo
 #
 PKG_CHECK_MODULES(PC_CAIRO REQUIRED cairo)
@@ -139,8 +157,8 @@ FIND_LIBRARY(
 #result
 #
 #
-SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
-SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${HARFBUZZ_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
 
 INCLUDE(FindPackageHandleStandardArgs)
 
-- 
cgit v1.1

Places

File Fix-build-with-pango-1.4.patch of Package kde-gtk-config4

Places