[pango] Revert "Reduce overlinking"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Revert "Reduce overlinking"
- Date: Sat, 13 Jul 2019 02:29:18 +0000 (UTC)
commit abac455bbbc097ea01c867e409e22a4a3b20b172
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 12 22:26:16 2019 -0400
Revert "Reduce overlinking"
This reverts commit f972ba0562823a8d55ad02ff9609481a884c79f8.
meson.build | 8 +++-----
pango/meson.build | 8 +++++---
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index d1150907..73b5da2b 100644
--- a/meson.build
+++ b/meson.build
@@ -183,8 +183,6 @@ endif
# Dependencies
pango_deps = []
-pangoxft_deps = []
-pangocairo_deps = []
glib_req_version = '>= 2.59.2'
fribidi_req_version = '>= 0.19.7'
@@ -316,8 +314,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)
- pangoxft_deps += dependency('xrender', required: false)
- pangoxft_deps += xft_dep
+ pango_deps += dependency('xrender', required: false)
+ pango_deps += xft_dep
endif
if host_system == 'darwin'
@@ -490,7 +488,7 @@ endif
if cairo_dep.found()
pango_conf.set('HAVE_CAIRO', 1)
- pangocairo_deps += cairo_dep
+ pango_deps += cairo_dep
pangocairo_requires = ''
diff --git a/pango/meson.build b/pango/meson.build
index bcb5ad72..4ca062ec 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -282,7 +282,7 @@ if xft_dep.found() and fontconfig_dep.found()
soversion: pango_soversion,
darwin_versions : pango_osxversion,
install: true,
- dependencies: pango_deps + pangoxft_deps + [ libpango_dep, libpangoft2_dep ],
+ dependencies: pango_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,13 +408,15 @@ if cairo_dep.found()
'pangocairo-render.c',
]
- pangocairo_deps += libpango_dep
+ pangocairo_deps = pango_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')
@@ -484,7 +486,7 @@ if cairo_dep.found()
libpangocairo_dep = declare_dependency(
link_with: libpangocairo,
include_directories: root_inc,
- dependencies: pangocairo_deps + pango_deps + [ libpango_dep ],
+ dependencies: pango_deps + [ libpango_dep ],
sources: pangocairo_dep_sources,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]