[gedit] snap: Updated gtksourceview and gedit-plugins parts to use meson

[Ken VanDine <kvandine src gnome org>]

commit 83289b475f825791efd64649f9e0fbf112176363
Author: Ken VanDine <ken vandine org>
Date:   Thu Aug 8 12:32:36 2019 -0400

    snap: Updated gtksourceview and gedit-plugins parts to use meson

 snap/snapcraft.yaml | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0e8c63917..ff264a186 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -59,8 +59,8 @@ apps:
     common-id: org.gnome.gedit.desktop
     environment:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
-      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit
-      GI_TYPELIB_PATH: 
$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/girepository-1.0:$SNAP/gnome-platform/usr/lib/girepository-1.0:$SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/girepository-1.0
+      LD_LIBRARY_PATH: 
$LD_LIBRARY_PATH:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
+      GI_TYPELIB_PATH: 
$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit/girepository-1.0:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/girepository-1.0:$SNAP/gnome-platform/usr/lib/girepository-1.0:$SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/girepository-1.0
       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$SNAP/gnome-platform/usr/lib/python3/dist-packages
       GTK_USE_PORTAL: 1
 
@@ -80,14 +80,18 @@ parts:
   gtksourceview:
     source: https://gitlab.gnome.org/GNOME/gtksourceview.git
     source-type: git
-    plugin: autotools
-    configflags: [--prefix=/snap/gedit/current/usr]
+    plugin: meson
+    meson-parameters:
+      - --prefix=/usr
+      - -Dc_args="-Wno-error=undef"
     organize:
       snap/gedit/current/usr: usr
     build-packages:
       - autoconf-archive
       - gettext
       - gobject-introspection
+      - gtk-doc-tools
+      - libfribidi-dev
       - libgirepository1.0-dev
       - libglib2.0-dev
       - libgtk-3-dev
@@ -98,8 +102,8 @@ parts:
     # meson gir overrides don't work well
     override-build: |
        snapcraftctl build
-       cp $SNAPCRAFT_PART_INSTALL/snap/gedit/current/usr/share/gir-1.0/GtkSource* /usr/share/gir-1.0
-       cp $SNAPCRAFT_PART_INSTALL/snap/gedit/current/usr/share/vala/vapi/gtksource* /usr/share/vala/vapi
+       cp $SNAPCRAFT_PART_INSTALL/usr/share/gir-1.0/GtkSource* /usr/share/gir-1.0
+       cp $SNAPCRAFT_PART_INSTALL/usr/share/vala/vapi/gtksource* /usr/share/vala/vapi
 
   gedit:
     after: [desktop-gnome-platform, gtksourceview]
@@ -109,6 +113,8 @@ parts:
     plugin: meson
     meson-parameters:
       - --prefix=/usr
+      - -Dvala_args="--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi"
+
     build-environment:
       - C_INCLUDE_PATH: $SNAPCRAFT_STAGE/usr/include/gtksourceview-4
     override-build: |
@@ -136,17 +142,34 @@ parts:
       - gobject-introspection
       - libgirepository1.0-dev
       - valac
+    stage-packages:
+      - libfribidi0
 
   gedit-plugins:
     after: [gedit]
     source: https://gitlab.gnome.org/GNOME/gedit-plugins.git
     source-type: git
-    plugin: autotools
-    # gedit's meson build uses the triplet libdir but gedit-plugin's
-    # autotools doesn't. They need to match.
-    configflags:
+    plugin: meson
+    meson-parameters:
       - --prefix=/snap/gedit/current/usr
-      - --libdir=/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
+      - -Dplugin_bookmarks=true
+      - -Dplugin_bracketcompletion=true
+      - -Dplugin_charmap=true
+      - -Dplugin_codecomment=true
+      - -Dplugin_colorpicker=true
+      - -Dplugin_colorschemer=true
+      - -Dplugin_commander=false
+      - -Dplugin_drawspaces=true
+      - -Dplugin_findinfiles=false
+      - -Dplugin_git=true
+      - -Dplugin_joinlines=true
+      - -Dplugin_multiedit=false
+      - -Dplugin_smartspaces=true
+      - -Dplugin_terminal=true
+      - -Dplugin_textsize=true
+      - -Dplugin_translate=true
+      - -Dplugin_wordcompletion=true
+      - -Dplugin_zeitgeist=false
     organize:
       snap/gedit/current/usr: usr
     build-environment:
@@ -169,11 +192,6 @@ parts:
       - python-dbus-dev
       - python-gi-dev
       - yelp-tools
-# Overriding VAPIDIR in build-environment doesn't seem to work
-    override-build: |
-      sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' 
plugins/findinfiles/Makefile.am
-      sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' 
plugins/findinfiles/Makefile.am
-      snapcraftctl build
 # Zeitgeist plugin isn't as useful in a Snap.
     stage:
       - -usr/lib/gedit/plugins/libzeitgeist.so