build: switch build to GTK 4

This commit is contained in:
Christian Hergert
2021-09-28 14:21:44 -07:00
parent a1f8f7e9f8
commit 5e55f5f2cc
3 changed files with 8 additions and 6 deletions

View File

@ -15,13 +15,15 @@ pkgconfig = import('pkgconfig')
i18n = import('i18n') i18n = import('i18n')
libsysprof_api_version = 4 libsysprof_api_version = 4
libsysprof_ui_api_version = 5
version_split = meson.project_version().split('.') version_split = meson.project_version().split('.')
datadir = get_option('datadir') datadir = get_option('datadir')
datadir_for_pc_file = join_paths('${prefix}', datadir) datadir_for_pc_file = join_paths('${prefix}', datadir)
podir = join_paths(meson.current_source_dir(), 'po') podir = join_paths(meson.current_source_dir(), 'po')
glib_req_version = '>= 2.67.4' glib_req_version = '>= 2.68.0'
gtk_req_version = '>= 3.22' gtk_req_version = '>= 4.4'
polkit_req_version = '>= 0.105' polkit_req_version = '>= 0.105'
cc = meson.get_compiler('c') cc = meson.get_compiler('c')

View File

@ -88,7 +88,7 @@ libsysprof_ui_resources = gnome.compile_resources(
# Subset of dependencies used in generating the pkg-config file # Subset of dependencies used in generating the pkg-config file
libsysprof_ui_pkg_deps = [ libsysprof_ui_pkg_deps = [
dependency('gio-2.0', version: glib_req_version), 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 + [ 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_pkg_deps += libsysprof
libsysprof_ui = shared_library( 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, libsysprof_ui_public_sources + libsysprof_ui_private_sources + libsysprof_ui_resources,
dependencies: libsysprof_ui_deps + [librax_dep], dependencies: libsysprof_ui_deps + [librax_dep],
@ -121,7 +121,7 @@ pkgconfig.generate(
subdirs: [ sysprof_header_subdir ], subdirs: [ sysprof_header_subdir ],
description: 'The UI library for GTK applications embedding sysprof', description: 'The UI library for GTK applications embedding sysprof',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'), 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, libraries_private: libsysprof_ui_pkg_deps,
variables: [ variables: [
'datadir=' + datadir_for_pc_file, 'datadir=' + datadir_for_pc_file,

View File

@ -122,7 +122,7 @@ if get_option('enable_gtk')
test_ui_deps = [ test_ui_deps = [
libsysprof_dep, libsysprof_dep,
libsysprof_ui_dep, libsysprof_ui_dep,
dependency('gtk+-3.0', version: gtk_req_version), dependency('gtk4', version: gtk_req_version),
dependency('pangoft2', required: false), dependency('pangoft2', required: false),
] ]