[gnome-builder] build: Move libgd to a subproject



commit 4c48f55e0190a476c2b6d4894255ebdefd4352d4
Author: Patrick Griffis <tingping tingping se>
Date:   Mon Jun 5 17:27:50 2017 -0400

    build: Move libgd to a subproject

 .gitmodules                                   |    3 +
 contrib/gd/gd-tagged-entry-default.css        |   34 -
 contrib/gd/gd-tagged-entry.c                  | 1350 -------------------------
 contrib/gd/gd-tagged-entry.gresource.xml      |    6 -
 contrib/gd/gd-tagged-entry.h                  |  117 ---
 contrib/gd/meson.build                        |   26 -
 libide/editor/ide-editor-frame-private.h      |    2 +-
 meson.build                                   |    8 +-
 plugins/devhelp/gbp-devhelp-search-private.h  |    2 +-
 plugins/terminal/gb-terminal-search-private.h |    2 +-
 plugins/terminal/gb-terminal-view-private.h   |    2 +-
 subprojects/libgd                             |    1 +
 12 files changed, 15 insertions(+), 1538 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..054b71c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/libgd"]
+       path = subprojects/libgd
+       url = https://git.gnome.org/browse/libgd
diff --git a/libide/editor/ide-editor-frame-private.h b/libide/editor/ide-editor-frame-private.h
index 4f47962..e187d1f 100644
--- a/libide/editor/ide-editor-frame-private.h
+++ b/libide/editor/ide-editor-frame-private.h
@@ -19,7 +19,7 @@
 #ifndef IDE_EDITOR_FRAME_PRIVATE_H
 #define IDE_EDITOR_FRAME_PRIVATE_H
 
-#include <gd-tagged-entry.h>
+#include <libgd/gd.h>
 #include <gtk/gtk.h>
 #include <nautilus-floating-bar.h>
 
diff --git a/meson.build b/meson.build
index f7f41d7..7af7998 100644
--- a/meson.build
+++ b/meson.build
@@ -129,6 +129,13 @@ libdazzle_dep = dependency('libdazzle-1.0', version: '>= 0.1.0')
 libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.25.2')
 libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2')
 
+libgd = subproject('libgd',
+  default_options: [
+    'with-tagged-entry=true'
+  ]
+)
+libgd_dep = libgd.get_variable('libgd_dep')
+
 if get_option('with_flatpak') or get_option('with_git')
   libgit_dep = dependency('libgit2-glib-1.0', version: '>= 0.25.0')
 
@@ -176,7 +183,6 @@ subdir('data/fonts')
 subdir('data/gsettings')
 subdir('data/icons')
 subdir('data/style-schemes')
-subdir('contrib/gd')
 subdir('contrib/libeditorconfig')
 subdir('contrib/nautilus')
 subdir('contrib/xml')
diff --git a/plugins/devhelp/gbp-devhelp-search-private.h b/plugins/devhelp/gbp-devhelp-search-private.h
index b565cf2..db3085a 100644
--- a/plugins/devhelp/gbp-devhelp-search-private.h
+++ b/plugins/devhelp/gbp-devhelp-search-private.h
@@ -19,7 +19,7 @@
 #ifndef GBP_DEVHELP_SEARCH_PRIVATE_H
 #define GBP_DEVHELP_SEARCH_PRIVATE_H
 
-#include <gd-tagged-entry.h>
+#include <libgd/gd.h>
 #include <ide.h>
 
 G_BEGIN_DECLS
diff --git a/plugins/terminal/gb-terminal-search-private.h b/plugins/terminal/gb-terminal-search-private.h
index 0ff7833..a10dc5e 100644
--- a/plugins/terminal/gb-terminal-search-private.h
+++ b/plugins/terminal/gb-terminal-search-private.h
@@ -19,7 +19,7 @@
 #ifndef GB_TERMINAL_SEARCH_PRIVATE_H
 #define GB_TERMINAL_SEARCH_PRIVATE_H
 
-#include <gd-tagged-entry.h>
+#include <libgd/gd.h>
 #include <ide.h>
 #include <vte/vte.h>
 
diff --git a/plugins/terminal/gb-terminal-view-private.h b/plugins/terminal/gb-terminal-view-private.h
index aa88932..6e30244 100644
--- a/plugins/terminal/gb-terminal-view-private.h
+++ b/plugins/terminal/gb-terminal-view-private.h
@@ -19,7 +19,7 @@
 #ifndef GB_TERMINAL_VIEW_PRIVATE_H
 #define GB_TERMINAL_VIEW_PRIVATE_H
 
-#include <gd-tagged-entry.h>
+#include <libgd/gd.h>
 #include <ide.h>
 #include <vte/vte.h>
 
diff --git a/subprojects/libgd b/subprojects/libgd
new file mode 160000
index 0000000..edcb3af
--- /dev/null
+++ b/subprojects/libgd
@@ -0,0 +1 @@
+Subproject commit edcb3af3790a0d108bf303aca989c24eab675c49


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