[gtksourceview/wip/chergert/gsv-gtk4: 18/131] glade: remove glade catalog support



commit eb40b1fb6de2e243474d6f4c2f001ccbd0841011
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 8 15:25:10 2020 -0800

    glade: remove glade catalog support
    
    There is no glade for GTK 4 (and unlikely it will continue to
    exist there in it's current form). This drops the glade bits so
    we can try to keep things compiling as much as we can during the
    port to GTK 4.

 data/glade/gtksourceview.xml.in | 44 -----------------------------------------
 data/glade/meson.build          | 37 ----------------------------------
 data/meson.build                |  4 ----
 meson.build                     |  9 ---------
 meson_options.txt               |  4 ----
 5 files changed, 98 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 2ca97a5f..45387d48 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,3 @@
-if install_glade_catalog
-  subdir('glade')
-endif
-
 install_subdir('language-specs',
     install_dir: pkgdatadir,
   exclude_files: [ 'Makefile.am',
diff --git a/meson.build b/meson.build
index b71db895..7517d672 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,6 @@ testdatadir = join_paths(datadir, 'installed-tests', package_string)
 docpath = join_paths(datadir, 'gtk-doc', 'html', package_string)
 
 # Options
-install_glade_catalog = get_option('glade_catalog')
 generate_gir = get_option('gir')
 generate_vapi = generate_gir and get_option('vapi')
 build_gtk_doc = get_option('gtk_doc')
@@ -73,7 +72,6 @@ libm_dep = cc.find_library('m', required: false)
 glib_req = '>= @0@'.format(glib_req_version)
 gtk_req = '>= @0@'.format(gtk_req_version)
 libxml_req = '>= 2.6'
-gladeui_req = '>= 3.9'
 introspection_req  = '>= 1.42.0'
 gtk_doc_req = '>= 1.25'
 fribidi_req = '>= 0.19.7'
@@ -87,12 +85,6 @@ fribidi_dep = dependency('fribidi', version: fribidi_req)
 
 gtk_quartz_dep = dependency('gtk+-quartz-3.0', version: gtk_doc_req, required: false)
 
-if install_glade_catalog
-  gladeui_dep = dependency('gladeui-2.0', version: gladeui_req)
-else
-  gladeui_dep = []
-endif
-
 if generate_gir
   introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req)
 else
@@ -288,7 +280,6 @@ summary = [
   'GtkSourceView @0@ (@1@)'.format(version, api_version),
   '',
   '  Documentation: @0@'.format(build_gtk_doc),
-  '  Glade catalog: @0@'.format(install_glade_catalog),
   '  Install tests: @0@'.format(get_option('install_tests')),
   '  Introspection: @0@'.format(generate_gir),
   '      Vala vapi: @0@'.format(generate_vapi),
diff --git a/meson_options.txt b/meson_options.txt
index a58139e0..2ded0af0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,3 @@
-option('glade_catalog',
-       type: 'boolean', value: false,
-       description: 'Whether to install Glade catalog')
-
 option('install_tests',
        type: 'boolean', value: false,
        description: 'Install test programs')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]