[gnome-text-editor] build: switch to libeditorconfig

[Christian Hergert <chergert src gnome org>]

commit 6ea5bbae19acdcce45044ad91b7b28f8a7e5870d
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jul 22 10:24:24 2022 -0700

    build: switch to libeditorconfig
    
    We don't need our vendored libeditorconfig anymore now that the upstream
    version is more widely available. More importantly, it's moved on to
    PCRE2 and we want to drop PCRE1 altogether now that GLib has too.

 meson.build                                        |   1 +
 src/editorconfig/editorconfig-glib.c               |   2 +-
 src/editorconfig/libeditorconfig/ec_glob.c         | 371 --------------
 src/editorconfig/libeditorconfig/ec_glob.h         |  43 --
 src/editorconfig/libeditorconfig/editorconfig.c    | 547 ---------------------
 src/editorconfig/libeditorconfig/editorconfig.h    |  37 --
 .../libeditorconfig/editorconfig/editorconfig.h    | 309 ------------
 .../editorconfig/editorconfig_handle.h             | 193 --------
 .../libeditorconfig/editorconfig_handle.c          | 155 ------
 .../libeditorconfig/editorconfig_handle.h          |  89 ----
 src/editorconfig/libeditorconfig/global.h          |  80 ---
 src/editorconfig/libeditorconfig/ini.c             | 200 --------
 src/editorconfig/libeditorconfig/ini.h             |  93 ----
 src/editorconfig/libeditorconfig/meson.build       |  41 --
 src/editorconfig/libeditorconfig/misc.c            | 250 ----------
 src/editorconfig/libeditorconfig/misc.h            |  62 ---
 src/editorconfig/libeditorconfig/utarray.h         | 232 ---------
 src/editorconfig/meson.build                       |   2 -
 src/meson.build                                    |   3 +-
 19 files changed, 3 insertions(+), 2707 deletions(-)
---
diff --git a/meson.build b/meson.build
index ffc75dc..411cc4c 100644
--- a/meson.build
+++ b/meson.build
@@ -44,6 +44,7 @@ libglib_dep = dependency('gio-2.0', version: glib_req)
 libgtk_dep = dependency('gtk4', version: gtk_req)
 libgtksourceview_dep = dependency('gtksourceview-5', version: gtksourceview_req)
 libadwaita_dep = dependency('libadwaita-1', version: '>= 1.2.alpha')
+libeditorconfig_dep = dependency('editorconfig')
 
 # Specify minimum library versions
 glib_major = glib_req_version.split('.')[0].to_int()
diff --git a/src/editorconfig/editorconfig-glib.c b/src/editorconfig/editorconfig-glib.c
index c12f160..18354bf 100644
--- a/src/editorconfig/editorconfig-glib.c
+++ b/src/editorconfig/editorconfig-glib.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <editorconfig.h>
+#include <editorconfig/editorconfig.h>
 
 #include "editorconfig-glib.h"
 
diff --git a/src/editorconfig/meson.build b/src/editorconfig/meson.build
index 4279920..ec4fe2e 100644
--- a/src/editorconfig/meson.build
+++ b/src/editorconfig/meson.build
@@ -1,5 +1,3 @@
-subdir('libeditorconfig')
-
 editor_deps += [libeditorconfig_dep]
 
 editor_sources += files([
diff --git a/src/meson.build b/src/meson.build
index 10056f4..1294321 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -96,8 +96,7 @@ subdir('editorconfig')
 
 editor = executable('gnome-text-editor', editor_sources + editor_enums + [build_ident_h],
   include_directories: [include_directories('..'),
-                        include_directories('editorconfig'),
-                        include_directories('editorconfig/libeditorconfig')],
+                        include_directories('editorconfig')],
                c_args: editor_c_args,
          dependencies: editor_deps,
               install: true,