diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-07-10 02:42:31 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-10 02:42:31 +0000 |
commit | 27817e637d3297c5208678c6aff684065fa49898 (patch) | |
tree | 87729701b1f58485f8aa79e47be9f4ce0223c202 | |
parent | f86b5181bb5f3c4db52bdef70bc34a02834c4a08 (diff) | |
parent | 8b85815f1b122842d915e7fc29cc68d228a64dbb (diff) | |
download | pango-27817e637d3297c5208678c6aff684065fa49898.tar.gz |
Merge branch 'move-fc' into 'master'
Move fontconfig
See merge request GNOME/pango!77
-rw-r--r-- | meson.build | 8 | ||||
-rw-r--r-- | pango/meson.build | 38 | ||||
-rw-r--r-- | tests/meson.build | 4 | ||||
-rw-r--r-- | utils/meson.build | 2 |
4 files changed, 33 insertions, 19 deletions
diff --git a/meson.build b/meson.build index 73b5da2b..d1150907 100644 --- a/meson.build +++ b/meson.build @@ -183,6 +183,8 @@ endif # Dependencies pango_deps = [] +pangoxft_deps = [] +pangocairo_deps = [] glib_req_version = '>= 2.59.2' fribidi_req_version = '>= 0.19.7' @@ -314,8 +316,8 @@ endif xft_dep = dependency('xft', version: xft_req_version, required: false) if xft_dep.found() and fontconfig_dep.found() and freetype_dep.found() pango_conf.set('HAVE_XFT', 1) - pango_deps += dependency('xrender', required: false) - pango_deps += xft_dep + pangoxft_deps += dependency('xrender', required: false) + pangoxft_deps += xft_dep endif if host_system == 'darwin' @@ -488,7 +490,7 @@ endif if cairo_dep.found() pango_conf.set('HAVE_CAIRO', 1) - pango_deps += cairo_dep + pangocairo_deps += cairo_dep pangocairo_requires = '' diff --git a/pango/meson.build b/pango/meson.build index 4ca062ec..faf38780 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -56,6 +56,27 @@ pango_headers = [ 'pango-version-macros.h', ] +pango_requires = [ + 'gobject-2.0', +] + +if fontconfig_dep.found() + pango_headers += [ + 'pangofc-font.h', + 'pangofc-fontmap.h', + 'pangofc-decoder.h', + ] + pango_sources += [ + 'pangofc-font.c', + 'pangofc-fontmap.c', + 'pangofc-decoder.c', + 'pangofc-shape.c', + ] + pango_requires += [ + fontconfig_pc, + ] +endif + install_headers(pango_headers, subdir: pango_api_path) # Features header @@ -155,7 +176,7 @@ pkgconfig.generate(libpango, name: 'Pango', description: 'Internationalized text handling', version: meson.project_version(), - requires: ['gobject-2.0'], + requires: pango_requires, filebase: 'pango', subdirs: pango_api_name, install_dir: join_paths(pango_libdir, 'pkgconfig'), @@ -165,17 +186,10 @@ pkgconfig.generate(libpango, if build_pangoft2 pangoft2_headers = [ 'pango-ot.h', - 'pangofc-font.h', - 'pangofc-fontmap.h', - 'pangofc-decoder.h', 'pangoft2.h', ] pangoft2_public_sources = [ - 'pangofc-font.c', - 'pangofc-fontmap.c', - 'pangofc-decoder.c', - 'pangofc-shape.c', 'pangoft2.c', ] @@ -282,7 +296,7 @@ if xft_dep.found() and fontconfig_dep.found() soversion: pango_soversion, darwin_versions : pango_osxversion, install: true, - dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], + dependencies: pango_deps + pangoxft_deps + [ libpango_dep, libpangoft2_dep ], include_directories: [ root_inc, pango_inc ], c_args: common_cflags + pango_debug_cflags + pango_cflags + [ '-DPANGO_DISABLE_DEPRECATION_WARNINGS', @@ -408,15 +422,13 @@ if cairo_dep.found() 'pangocairo-render.c', ] - pangocairo_deps = pango_deps + [ libpango_dep ] + pangocairo_deps += libpango_dep if pango_font_backends.contains('freetype') pangocairo_sources += [ 'pangocairo-fcfont.c', 'pangocairo-fcfontmap.c', ] - - pangocairo_deps += libpangoft2_dep endif if host_system == 'windows' and pango_font_backends.contains('win32') @@ -486,7 +498,7 @@ if cairo_dep.found() libpangocairo_dep = declare_dependency( link_with: libpangocairo, include_directories: root_inc, - dependencies: pango_deps + [ libpango_dep ], + dependencies: pangocairo_deps + pango_deps + [ libpango_dep ], sources: pangocairo_dep_sources, ) diff --git a/tests/meson.build b/tests/meson.build index 0cc01642..b2d2d3e1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -21,8 +21,8 @@ tests = [ [ 'testboundaries_ucd' ], [ 'testcolor' ], [ 'testscript' ], - [ 'cxx-test', [ 'cxx-test.cpp' ] ], - [ 'test-break', [ 'test-break.c', 'test-common.c' ] ], + [ 'cxx-test', [ 'cxx-test.cpp' ], [ libpangocairo_dep ] ], + [ 'test-break', [ 'test-break.c', 'test-common.c' ], [libpangocairo_dep ] ], ] if build_pangoft2 diff --git a/utils/meson.build b/utils/meson.build index 510d1b7e..855f6e36 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -19,7 +19,7 @@ if xft_dep.found() and build_pangoft2 'viewer-pangoxft.c', 'viewer-x.c', ] - pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ] + pango_view_deps += pangoxft_deps + [ libpangoft2_dep, libpangoxft_dep, ] endif if cairo_dep.found() |