[gtksourceview/wip/chergert/gsv-gtk4: 67/172] build: bump to GTK 4 versions



commit 381d30bfa59e6320ae3de33c03e881646fe5175f
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.

 README.md   |  4 ++--
 meson.build | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/README.md b/README.md
index c288258e..b6d02139 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ The official web site is https://wiki.gnome.org/Projects/GtkSourceView.
 Dependencies
 ------------
 
-* GLib >= 2.48
-* GTK+ >= 3.22
+* GLib >= 2.62
+* GTK+ >= 3.96
 * libxml2 >= 2.6
 * freebidi >= 0.19.7
 
diff --git a/meson.build b/meson.build
index b7dd909d..51216ad6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,8 +1,8 @@
 project('gtksourceview', 'c',
-          version: '4.99.0',
+          version: '4.90.0',
           license: 'LGPL-2.1-or-later',
     meson_version: '>= 0.50.0',
-  default_options: [ 'c_std=gnu11',
+  default_options: [ 'c_std=gnu99',
                      'buildtype=debugoptimized',
                      'warning_level=2' ],
 )
@@ -66,8 +66,8 @@ build_gtk_doc = get_option('gtk_doc')
 # Dependencies
 cc = meson.get_compiler('c')
 
-glib_req_version = '2.48'
-gtk_req_version = '3.22'
+glib_req_version = '2.62'
+gtk_req_version = '3.96'
 
 libm_dep = cc.find_library('m', required: false)
 
@@ -81,11 +81,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)
@@ -120,9 +120,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]