[gtksourceview/wip/chergert/gsv-gtk4] build: bump to GTK 4 versions
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/chergert/gsv-gtk4] build: bump to GTK 4 versions
- Date: Wed, 8 Jan 2020 23:38:10 +0000 (UTC)
commit 6ce9b7b7a82279e98b248ee46df4a70fe92c4025
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 8 15:34:56 2020 -0800
build: bump to GTK 4 versions
This breaks compilation, but is the first step towards getting
our port to GTK 4 landed.
meson.build | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index eae86c56..887298af 100644
--- a/meson.build
+++ b/meson.build
@@ -65,7 +65,7 @@ build_gtk_doc = get_option('gtk_doc')
cc = meson.get_compiler('c')
glib_req_version = '2.48'
-gtk_req_version = '3.22'
+gtk_req_version = '3.96'
libm_dep = cc.find_library('m', required: false)
@@ -79,11 +79,11 @@ fribidi_req = '>= 0.19.7'
glib_dep = dependency('glib-2.0', version: glib_req)
gobject_dep = dependency('gobject-2.0', version: glib_req)
gio_dep = dependency('gio-2.0', version: glib_req)
-gtk_dep = dependency('gtk+-3.0', version: gtk_req)
+gtk_dep = dependency('gtk4', version: gtk_req)
libxml_dep = dependency('libxml-2.0', version: libxml_req, required: cc.get_id() != 'msvc')
fribidi_dep = dependency('fribidi', version: fribidi_req)
-gtk_quartz_dep = dependency('gtk+-quartz-3.0', version: gtk_doc_req, required: false)
+gtk_quartz_dep = dependency('gtk4-quartz', version: gtk_doc_req, required: false)
if generate_gir
introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req)
@@ -118,9 +118,10 @@ glib_version_arr = glib_req_version.split('.')
glib_major_version = glib_version_arr[0]
glib_minor_version = glib_version_arr[1]
+# Override until GTK 4 is released
gtk_version_arr = gtk_req_version.split('.')
-gtk_major_version = gtk_version_arr[0]
-gtk_minor_version = gtk_version_arr[1]
+gtk_major_version = '4' # gtk_version_arr[0]
+gtk_minor_version = '0' # gtk_version_arr[1]
# Configurations
add_project_arguments([
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]