[pango/fix-build-osx] meson: fix build on osx



commit 1ce6fc1c349afce1b7c04e02388b3caed7d46f7d
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Tue Oct 2 16:47:59 2018 +0200

    meson: fix build on osx
    
    Fixes https://gitlab.gnome.org/GNOME/pango/issues/324

 meson.build       | 2 ++
 pango/meson.build | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 61bc9924..e5f34447 100644
--- a/meson.build
+++ b/meson.build
@@ -312,6 +312,8 @@ if host_system == 'darwin'
   if has_core_text
     pango_conf.set('HAVE_CORE_TEXT', 1)
   endif
+
+  pango_deps += dependency('appleframeworks', modules: [ 'CoreFoundation', 'ApplicationServices' ])
 endif
 
 cairo_pkgconfig_found = false
diff --git a/pango/meson.build b/pango/meson.build
index f8b484a5..254b169a 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -112,7 +112,7 @@ libpango = library(
   version: pango_libversion,
   soversion: pango_soversion,
   install: true,
-  dependencies: [ gobject_dep, mathlib_dep, thai_dep, fribidi_dep ],
+  dependencies: pango_deps,
   include_directories: [ root_inc, pango_inc ],
   c_args: common_cflags + pango_debug_cflags + pango_cflags,
   link_args: common_ldflags,
@@ -442,7 +442,6 @@ if cairo_dep.found()
       'pangocairo-coretextfont.c',
       'pangocairo-coretextfontmap.c',
     ]
-    pangocairo_deps += dependency('appleframeworks', modules: [ 'CoreFoundation', 'ApplicationServices' ])
   endif
 
   install_headers(pangocairo_headers, subdir: pango_api_path)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]