[gnome-builder] build: drop various subprojects

[Christian Hergert <chergert src gnome org>]

commit eb77f0b4c9bac898a7f0ec30d35c15ba2f3f04c7
Author: Christian Hergert <chergert redhat com>
Date:   Thu Sep 21 12:57:41 2017 -0700

    build: drop various subprojects
    
    These projects are all now standalone, so bundling them is no
    longer necessary for Builder.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788009

 .gitmodules                       |    9 -------
 meson.build                       |   46 ++----------------------------------
 src/libide/meson.build            |    6 ++--
 src/plugins/vala-pack/meson.build |   11 +-------
 subprojects/jsonrpc-glib          |    1 -
 subprojects/libdazzle             |    1 -
 subprojects/template-glib         |    1 -
 7 files changed, 8 insertions(+), 67 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 2adef65..054b71c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
 [submodule "subprojects/libgd"]
        path = subprojects/libgd
        url = https://git.gnome.org/browse/libgd
-[submodule "subprojects/jsonrpc-glib"]
-       path = subprojects/jsonrpc-glib
-       url = https://git.gnome.org/browse/jsonrpc-glib
-[submodule "subprojects/template-glib"]
-       path = subprojects/template-glib
-       url = https://git.gnome.org/browse/template-glib
-[submodule "subprojects/libdazzle"]
-       path = subprojects/libdazzle
-       url = https://git.gnome.org/browse/libdazzle
diff --git a/meson.build b/meson.build
index 3c27fc5..20c966f 100644
--- a/meson.build
+++ b/meson.build
@@ -171,49 +171,9 @@ libgtk_dep = dependency('gtk+-3.0', version: '>= 3.22.1')
 libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
 libm_dep = cc.find_library('m', required: false)
 libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.0')
-libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.26.0', required: false)
-libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.26.0', required: false)
-libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.26.0',
-  fallback: ['jsonrpc-glib', 'libjsonrpc_glib_dep'],
-  default_options: [
-    'with_introspection=false',
-    'with_vapi=false',
-    'package_subdir=' + meson.project_name()
-  ],
-)
-
-libtemplate_glib_gir = 'Template-1.0'
-libtemplate_glib_vapi = 'template-glib-1.0'
-if not libtemplate_glib_dep.found()
-  libtemplate_glib = subproject('template-glib',
-    default_options: [
-      'with_introspection=true',
-      'with_vapi=true',
-      'package_subdir=' + meson.project_name()
-    ]
-  )
-  libtemplate_glib_dep = libtemplate_glib.get_variable('libtemplate_glib_dep')
-  libtemplate_glib_gir = libtemplate_glib.get_variable('libtemplate_glib_gir')[0]
-  libtemplate_glib_vapi = libtemplate_glib.get_variable('libtemplate_glib_vapi')
-endif
-
-libdazzle_gir = 'Dazzle-1.0'
-libdazzle_vapi = 'libdazzle-1.0'
-libdazzle_bundled = false
-if not libdazzle_dep.found()
-  libdazzle = subproject('libdazzle',
-    default_options: [
-      'with_introspection=true',
-      'with_vapi=true',
-      'package_subdir=' + meson.project_name()
-    ]
-  )
-  libdazzle_dep = libdazzle.get_variable('libdazzle_dep')
-  libdazzle_gir = libdazzle.get_variable('libdazzle_gir')[0]
-  libdazzle_vapi = libdazzle.get_variable('libdazzle_vapi')
-  libdazzle_bundled = true
-endif
-
+libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.26.0')
+libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.26.0')
+libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.26.0')
 
 libgd = subproject('libgd',
   default_options: [
diff --git a/src/libide/meson.build b/src/libide/meson.build
index 82660ab..cdf01fc 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -279,7 +279,7 @@ libide_gir = gnome.generate_gir(libide,
          dependencies: [ libgd_dep ],
         symbol_prefix: 'ide',
     identifier_prefix: 'Ide',
-             includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', libdazzle_gir, 'Json-1.0', 
libtemplate_glib_gir ],
+             includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0'],
              install: true,
       install_dir_gir: pkggirdir,
   install_dir_typelib: pkgtypelibdir,
@@ -304,9 +304,9 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
                  'gtk+-3.0',
                  'gtksourceview-3.0',
                  'json-glib-1.0',
-                 libdazzle_vapi,
+                 'libdazzle-1.0',
                  'libpeas-1.0',
-                 libtemplate_glib_vapi,
+                 'template-glib-1.0',
                ],
 )
 
diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build
index b901587..42f32bd 100644
--- a/src/plugins/vala-pack/meson.build
+++ b/src/plugins/vala-pack/meson.build
@@ -30,8 +30,6 @@ if not libvala_found
   error('Failed to find suitable libvala')
 endif
 
-vala_extra_args = []
-
 vala_pack_sources = [
   'config.vapi',
   'ide-vala-service.vala',
@@ -56,12 +54,6 @@ vala_pack_deps = [
   libide_vapi,
 ]
 
-if libdazzle_bundled
-  vala_pack_deps += libdazzle_vapi
-else
-  vala_extra_args += '--pkg=libdazzle-1.0'
-endif
-
 shared_module('vala-pack-plugin', vala_pack_sources,
   dependencies: plugin_deps + vala_pack_deps,
   vala_args: [
@@ -71,7 +63,8 @@ shared_module('vala-pack-plugin', vala_pack_sources,
     '--pkg=gtksourceview-3.0',
     '--pkg=gio-2.0',
     '--pkg=libvala-' + libvala_version,
-  ] + vala_extra_args,
+    '--pkg=libdazzle-1.0',
+  ],
   c_args: [
     '-DVALA_VERSION="@0@"'.format(libvala_version),
     '-DLOG_DOMAIN="vala-pack-plugin"',