[gnome-builder] plugins/editorconfig: remove in-tree libeditorconfig
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] plugins/editorconfig: remove in-tree libeditorconfig
- Date: Fri, 22 Jul 2022 18:14:30 +0000 (UTC)
commit 38f2e692d7f2cd7692b95788f478ab72da3324fa
Author: Christian Hergert <chergert redhat com>
Date: Fri Jul 22 11:14:20 2022 -0700
plugins/editorconfig: remove in-tree libeditorconfig
We can rely on the upstream now that it is more widely available and more
importantly uses PCRE2 internally now.
org.gnome.Builder.Devel.json | 12 +
src/plugins/editorconfig/editorconfig-glib.c | 2 +-
src/plugins/editorconfig/libeditorconfig/ec_glob.c | 371 --------------
src/plugins/editorconfig/libeditorconfig/ec_glob.h | 43 --
.../editorconfig/libeditorconfig/editorconfig.c | 547 ---------------------
.../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/plugins/editorconfig/libeditorconfig/global.h | 80 ---
src/plugins/editorconfig/libeditorconfig/ini.c | 200 --------
src/plugins/editorconfig/libeditorconfig/ini.h | 93 ----
.../editorconfig/libeditorconfig/meson.build | 45 --
src/plugins/editorconfig/libeditorconfig/misc.c | 250 ----------
src/plugins/editorconfig/libeditorconfig/misc.h | 62 ---
src/plugins/editorconfig/libeditorconfig/utarray.h | 232 ---------
src/plugins/editorconfig/meson.build | 2 +-
18 files changed, 14 insertions(+), 2708 deletions(-)
---
diff --git a/org.gnome.Builder.Devel.json b/org.gnome.Builder.Devel.json
index efcbc6e4b..9c3b0ec42 100644
--- a/org.gnome.Builder.Devel.json
+++ b/org.gnome.Builder.Devel.json
@@ -276,6 +276,18 @@
}
]
},
+ {
+ "name" : "libeditorconfig",
+ "buildsystem" : "cmake",
+ "config-opts" : [ "-DINSTALL_HTML_DOC=OFF" ],
+ "sources" : [
+ {
+ "type" : "git",
+ "url" : "https://github.com/editorconfig/editorconfig-core-c.git",
+ "tag" : "v0.12.5"
+ }
+ ]
+ },
{
"name" : "vte",
"buildsystem" : "meson",
diff --git a/src/plugins/editorconfig/editorconfig-glib.c b/src/plugins/editorconfig/editorconfig-glib.c
index 808b93bb0..2376daa01 100644
--- a/src/plugins/editorconfig/editorconfig-glib.c
+++ b/src/plugins/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/plugins/editorconfig/meson.build b/src/plugins/editorconfig/meson.build
index 2637ff5de..287b5f5b9 100644
--- a/src/plugins/editorconfig/meson.build
+++ b/src/plugins/editorconfig/meson.build
@@ -1,6 +1,6 @@
if get_option('plugin_editorconfig')
-subdir('libeditorconfig')
+libeditorconfig_dep = dependency('editorconfig')
plugins_sources += files([
'editorconfig-glib.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]