[sysprof/wip/gtk4-port: 31/125] build: switch build to GTK 4
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sysprof/wip/gtk4-port: 31/125] build: switch build to GTK 4
- Date: Fri, 29 Oct 2021 02:02:31 +0000 (UTC)
commit afbb5eb0177cf0f976a6b9109a747130864bce64
Author: Christian Hergert <chergert redhat com>
Date: Tue Sep 28 14:21:44 2021 -0700
build: switch build to GTK 4
meson.build | 6 ++++--
src/libsysprof-ui/meson.build | 6 +++---
src/tests/meson.build | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index b09fecf2..e4adf3f1 100644
--- a/meson.build
+++ b/meson.build
@@ -15,13 +15,15 @@ pkgconfig = import('pkgconfig')
i18n = import('i18n')
libsysprof_api_version = 4
+libsysprof_ui_api_version = 5
+
version_split = meson.project_version().split('.')
datadir = get_option('datadir')
datadir_for_pc_file = join_paths('${prefix}', datadir)
podir = join_paths(meson.source_root(), 'po')
-glib_req_version = '>= 2.67.4'
-gtk_req_version = '>= 3.22'
+glib_req_version = '>= 2.68.0'
+gtk_req_version = '>= 4.4'
polkit_req_version = '>= 0.105'
cc = meson.get_compiler('c')
diff --git a/src/libsysprof-ui/meson.build b/src/libsysprof-ui/meson.build
index 92ad1122..2ad83acc 100644
--- a/src/libsysprof-ui/meson.build
+++ b/src/libsysprof-ui/meson.build
@@ -88,7 +88,7 @@ libsysprof_ui_resources = gnome.compile_resources(
# Subset of dependencies used in generating the pkg-config file
libsysprof_ui_pkg_deps = [
dependency('gio-2.0', version: glib_req_version),
- dependency('gtk+-3.0', version: gtk_req_version),
+ dependency('gtk4', version: gtk_req_version),
]
libsysprof_ui_deps = libsysprof_ui_pkg_deps + [
@@ -100,7 +100,7 @@ libsysprof_ui_deps = libsysprof_ui_pkg_deps + [
libsysprof_ui_pkg_deps += libsysprof
libsysprof_ui = shared_library(
- 'sysprof-ui-@0@'.format(libsysprof_api_version),
+ 'sysprof-ui-@0@'.format(libsysprof_ui_api_version),
libsysprof_ui_public_sources + libsysprof_ui_private_sources + libsysprof_ui_resources,
dependencies: libsysprof_ui_deps + [librax_dep],
@@ -121,7 +121,7 @@ pkgconfig.generate(
subdirs: [ sysprof_header_subdir ],
description: 'The UI library for GTK applications embedding sysprof',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
- requires: [ 'gio-2.0', 'gtk+-3.0' ],
+ requires: [ 'gio-2.0', 'gtk4' ],
libraries_private: libsysprof_ui_pkg_deps,
variables: [
'datadir=' + datadir_for_pc_file,
diff --git a/src/tests/meson.build b/src/tests/meson.build
index f7703eec..d1593cba 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -122,7 +122,7 @@ if get_option('enable_gtk')
test_ui_deps = [
libsysprof_dep,
libsysprof_ui_dep,
- dependency('gtk+-3.0', version: gtk_req_version),
+ dependency('gtk4', version: gtk_req_version),
dependency('pangoft2', required: false),
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]