[gedit] build: stop using libgd.wrap



commit dadc533f7da750c029a7a83ecd841c7cf2b2021c
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Jan 12 19:34:54 2019 -0500

    build: stop using libgd.wrap
    
    Try to fix gnome-continuous
    
    This breaks the autotools build but we intend to remove
    gedit's autotools support this month.
    
    Closes: https://gitlab.gnome.org/GNOME/gedit/issues/117

 .gitmodules            | 6 +++---
 libgd                  | 1 -
 meson.build            | 4 ++++
 subprojects/libgd      | 1 +
 subprojects/libgd.wrap | 4 ----
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 66989de51..e3f07001e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libgd"]
-       path = libgd
-       url = https://gitlab.gnome.org/GNOME/libgd.git
+[submodule "subprojects/libgd"]
+       path = subprojects/libgd
+       url = https://gitlab.gnome.org/gnome/libgd.git
diff --git a/meson.build b/meson.build
index 0327dc920..717b0bbb8 100644
--- a/meson.build
+++ b/meson.build
@@ -48,6 +48,10 @@ localdir = join_paths(datadir, 'local')
 vapidir = join_paths(datadir, 'vala', 'vapi')
 
 # Subprojects
+if not get_option('buildtype').contains('plain')
+  run_command('git', '-C', meson.source_root(), 'submodule', 'update', '--init', '--recursive')
+endif
+
 libgd_sp = subproject(
   'libgd',
   default_options: [
diff --git a/subprojects/libgd b/subprojects/libgd
new file mode 160000
index 000000000..c7c7ff4e0
--- /dev/null
+++ b/subprojects/libgd
@@ -0,0 +1 @@
+Subproject commit c7c7ff4e05d3fe82854219091cf116cce6b19de0


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