[gedit] snap: Build gtksourceview

[Jeremy Bicha <jbicha src gnome org>]

commit 78d33863b6dbfefe14eff9f8b59a8ecda2866227
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon Jan 28 16:53:57 2019 -0500

    snap: Build gtksourceview
    
    gtksourceview4 isn't part of the base snaps
    so we need to build it. Also merge some updates
    from the ubuntu-desktop bzr branch.

 snap/snapcraft.yaml | 63 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 12 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b5e41ebab..77515a910 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -15,12 +15,13 @@ description: |
 
 grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
+base: core18
 
 plugs:
-  gnome-3-26-1604:
+  gnome-3-28-1804:
     interface: content
     target: $SNAP/gnome-platform
-    default-provider: gnome-3-26-1604
+    default-provider: gnome-3-28-1804
   gtk-3-themes:
     interface: content
     target: $SNAP/data-dir/themes
@@ -62,20 +63,59 @@ apps:
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gedit
 
 parts:
-  gedit:
+  desktop-gnome-platform:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: gtk
+    plugin: make
+    make-parameters: ["FLAVOR=gtk3"]
+    build-packages:
+      - build-essential
+      - libgtk-3-dev
+    override-build: |
+      snapcraftctl build
+      mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
+
+  gtksourceview:
     after: [desktop-gnome-platform]
-    source: .
+    source: https://gitlab.gnome.org/GNOME/gtksourceview.git
+    source-type: git
+    source-tag: 4.0.3
+    plugin: autotools
+    configflags: [--prefix=/usr]
+    organize:
+      snap/gtksourceview/current/usr: usr
+    build-packages:
+      - autoconf-archive
+      - gettext
+      - gobject-introspection
+      - libgirepository1.0-dev
+      - libglib2.0-dev
+      - libgtk-3-dev
+      - libpeas-dev
+      - libxml2-dev
+      - libxml2-utils
+      - valac
+
+  gedit:
+    after: [gtksourceview]
+    source: https://gitlab.gnome.org/GNOME/gedit.git
+    source-type: git
+ #   source-tag: 3.30.2
     plugin: meson
-    meson-parameters: [--prefix=/snap/gedit/current/usr]
+    meson-parameters:
+      - --prefix=/snap/gedit/current/usr
+      - -Dintrospection=false
+    build-environment:
+      - PKG_CONFIG_PATH: $SNAPCRAFT_STAGE/usr/lib/pkgconfig
+      - VAPIDIR: $SNAPCRAFT_STAGE/usr/share/vala/vapi
     override-build: |
-      sed -i.bak -e 's|Icon=org.gnome.gedit$|Icon=${SNAP}/meta/gui/org.gnome.gedit.svg|g' 
data/org.gnome.gedit.desktop.in.in
-      snapcraftctl build
-      mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp ../src/data/icons/hicolor/scalable/apps/org.gnome.gedit.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp snapbuild/data/org.gnome.gedit.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
+       sed -i.bak -e 's|Icon=org.gnome.gedit$|Icon=${SNAP}/meta/gui/org.gnome.gedit.svg|g' 
data/org.gnome.gedit.desktop.in.in
+       snapcraftctl build
+       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
+       cp data/org.gnome.gedit.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
+       cp ../install/snap/gedit/current/usr/share/applications/org.gnome.gedit.desktop 
$SNAPCRAFT_PART_INSTALL/meta/gui/
     organize:
       snap/gedit/current/usr: usr
-    build-attributes: [no-system-libraries]
     build-packages:
       - desktop-file-utils
       - gettext
@@ -87,7 +127,6 @@ parts:
       - libxml2-dev
       - libglib2.0-dev
       - libgtk-3-dev
-      - libgtksourceview-4-dev
       - libpeas-dev
       - libx11-dev
       - python3