[gtk/pango2-windows: 6/10] build: Don't try to use pangowin32 in deps
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/pango2-windows: 6/10] build: Don't try to use pangowin32 in deps
- Date: Fri, 8 Jul 2022 03:57:09 +0000 (UTC)
commit c79b4e2e56d92d9ac9a9f88a486949cbcc58d98b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jun 30 14:54:01 2022 +0800
build: Don't try to use pangowin32 in deps
It's no longer there for Pango2.
gdk/win32/meson.build | 1 -
gtk/meson.build | 2 +-
meson.build | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 156c9ab730..56dceb4dfc 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -54,7 +54,6 @@ if have_egl
endif
gdk_win32_deps = [
- pangowin32_dep, # FIXME
cc.find_library('hid'),
]
diff --git a/gtk/meson.build b/gtk/meson.build
index d40d30c57a..2df8f900a4 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1141,7 +1141,7 @@ endif
if win32_enabled
gtk_cargs += ['-DGTK_PRINT_BACKENDS="file,lpr"']
- gtk_deps += [ giowin32_dep, pangowin32_dep ]
+ gtk_deps += [ giowin32_dep ]
gtk_deps += [
cc.find_library('advapi32'),
diff --git a/meson.build b/meson.build
index 89e82b53dc..69cc94aa64 100644
--- a/meson.build
+++ b/meson.build
@@ -780,9 +780,8 @@ configure_file(output: 'config.h',
configuration: cdata)
# Requires
-pango_pkgname = win32_enabled ? 'pangowin32' : 'pango'
gdk_packages = [
- '@0@ @1@'.format(pango_pkgname, pango_req),
+ 'pango @0@'.format(pango_req),
'pangocairo @0@'.format(pango_req),
'gdk-pixbuf-2.0 @0@'.format(gdk_pixbuf_req),
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]