[gnome-builder/gnome-builder-3-36] build: fix building externally

[Christian Hergert <chergert src gnome org>]

commit 130054741bc08459774b675ce6133f9357dac6b0
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 11 15:59:14 2020 -0700

    build: fix building externally
    
    Fixes #1213

 src/libide/core/ide-version.h.in                          | 4 ++--
 src/libide/debugger/ide-debugger-breakpoints.c            | 2 --
 src/libide/foundry/ide-deploy-strategy.c                  | 2 --
 src/libide/foundry/meson.build                            | 4 ++++
 src/main.c                                                | 1 -
 src/meson.build                                           | 2 +-
 src/plugins/buildconfig/ide-buildconfig-config-provider.c | 4 +---
 7 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/src/libide/core/ide-version.h.in b/src/libide/core/ide-version.h.in
index e25924764..f75082861 100644
--- a/src/libide/core/ide-version.h.in
+++ b/src/libide/core/ide-version.h.in
@@ -19,8 +19,8 @@
 #ifndef IDE_VERSION_H
 #define IDE_VERSION_H
 
-#if !defined(IDE_INSIDE) && !defined(IDE_COMPILATION)
-# error "Only <ide.h> can be included directly."
+#if !defined(IDE_CORE_INSIDE) && !defined(IDE_CORE_COMPILATION)
+# error "Only <libide-core.h> can be included directly."
 #endif
 
 /**
diff --git a/src/libide/debugger/ide-debugger-breakpoints.c b/src/libide/debugger/ide-debugger-breakpoints.c
index 966eb2f60..a9980ff0b 100644
--- a/src/libide/debugger/ide-debugger-breakpoints.c
+++ b/src/libide/debugger/ide-debugger-breakpoints.c
@@ -24,8 +24,6 @@
 
 #include <stdlib.h>
 
-#include "ide-debug.h"
-
 #include "ide-debugger-breakpoints.h"
 #include "ide-debugger-private.h"
 
diff --git a/src/libide/foundry/ide-deploy-strategy.c b/src/libide/foundry/ide-deploy-strategy.c
index 8524cb5d8..404c3cfbb 100644
--- a/src/libide/foundry/ide-deploy-strategy.c
+++ b/src/libide/foundry/ide-deploy-strategy.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include "ide-debug.h"
-
 #include "ide-pipeline.h"
 #include "ide-deploy-strategy.h"
 
diff --git a/src/libide/foundry/meson.build b/src/libide/foundry/meson.build
index d4878aa11..dc8899d54 100644
--- a/src/libide/foundry/meson.build
+++ b/src/libide/foundry/meson.build
@@ -28,6 +28,7 @@ libide_foundry_public_headers = [
   'ide-device-provider.h',
   'ide-device.h',
   'ide-fallback-build-system.h',
+  'ide-foundry-compat.h',
   'ide-foundry-types.h',
   'ide-local-device.h',
   'ide-pipeline-addin.h',
@@ -45,6 +46,9 @@ libide_foundry_public_headers = [
   'ide-simple-build-system-discovery.h',
   'ide-simple-build-target.h',
   'ide-simple-toolchain.h',
+  'ide-test.h',
+  'ide-test-manager.h',
+  'ide-test-provider.h',
   'ide-toolchain-manager.h',
   'ide-toolchain-provider.h',
   'ide-toolchain.h',
diff --git a/src/main.c b/src/main.c
index 242f1937a..c68c86bf6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,6 @@
 #include <unistd.h>
 
 #include "ide-application-private.h"
-#include "ide-debug.h"
 #include "ide-thread-private.h"
 #include "ide-terminal-private.h"
 #include "ide-private.h"
diff --git a/src/meson.build b/src/meson.build
index 494ca1653..08ae4331e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -96,7 +96,7 @@ pkgconfig.generate(
      filebase: 'gnome-builder-@0@.@1@'.format(MAJOR_VERSION, MINOR_VERSION),
   description: 'Contains the plugin container for Builder.',
   install_dir: join_paths(pkglibdir, 'pkgconfig'),
-     requires: [ 'gio-2.0', 'gio-unix-2.0', 'gtk+-3.0', 'libdazzle-1.0' ],
+     requires: [ 'gio-2.0', 'gio-unix-2.0', 'gtk+-3.0', 'gtksourceview-4', 'libdazzle-1.0', 'vte-2.91', 
'template-glib-1.0', 'libpeas-1.0' ],
 )
 
 libide_gir = gnome.generate_gir(gnome_builder,
diff --git a/src/plugins/buildconfig/ide-buildconfig-config-provider.c 
b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
index 410277c60..f9f11417b 100644
--- a/src/plugins/buildconfig/ide-buildconfig-config-provider.c
+++ b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
@@ -27,12 +27,10 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+#include <libide-core.h>
 #include <libide-foundry.h>
 #include <libide-threading.h>
 
-#include "ide-context.h"
-#include "ide-debug.h"
-
 #include "ide-buildconfig-config.h"
 #include "ide-buildconfig-config-provider.h"