[gnome-calculator/gnome-3-36] snap: Updated snap to use the latest snapcraft gnome extension

[Ken VanDine <kvandine src gnome org>]

commit a60e23a4e674df65643a1d2f1311932685cfe0d2
Author: Ken VanDine <kvandine gnome org>
Date:   Mon Apr 13 17:06:03 2020 -0400

    snap: Updated snap to use the latest snapcraft gnome extension

 snap/snapcraft.yaml | 61 +++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 35 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 79ac7771..078d3838 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -34,7 +34,7 @@ slots:
 apps:
   gnome-calculator:
     command: usr/bin/gnome-calculator
-    extensions: [gnome-3-28]
+    extensions: [gnome-3-34]
     plugs:
       - gsettings
       - network
@@ -43,36 +43,17 @@ apps:
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gnome-calculator
 
 parts:
-  gtksourceview:
-    source: https://gitlab.gnome.org/GNOME/gtksourceview.git
-    source-type: git
-    plugin: meson
-    meson-parameters: [--prefix=/usr, -Dc_args="-Wno-error=undef"]
-    organize:
-      snap/gtksourceview/current/usr: usr
-    build-packages:
-      - autoconf-archive
-      - gettext
-      - gobject-introspection
-      - gtk-doc-tools
-      - libfribidi-dev
-      - libgirepository1.0-dev
-      - libglib2.0-dev
-      - libgtk-3-dev
-      - libpeas-dev
-      - libxml2-dev
-      - libxml2-utils
-      - valac
-
   gnome-calculator:
-    after: [gtksourceview]
     source: .
     plugin: meson
-    meson-parameters: [--prefix=/snap/gnome-calculator/current/usr, 
-Dvala_args="--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi"]
+    meson-parameters:
+      - --prefix=/snap/gnome-calculator/current/usr
+      - -Dvala_args="--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi"
+      - -Ddisable-introspection=true
     organize:
       snap/gnome-calculator/current/usr: usr
-# overriding vapidir in build-environment doesn't seem to work
     override-build: |
+      sed -i.bak -e "s|subdir('doc')||g" meson.build
       sed -i.bak -e 's|Icon=org.gnome.Calculator$|Icon=${SNAP}/meta/gui/org.gnome.Calculator.svg|g' 
data/org.gnome.Calculator.desktop.in
       sed -i.bak -e 's|media: gnome_calculator_help_media|media: gnome_calculator_help_media, symlink_media: 
false|g' help/meson.build
       snapcraftctl build
@@ -81,23 +62,33 @@ parts:
     build-packages:
       - desktop-file-utils
       - gettext
-      - gnome-common
       - appstream-util
-      - gnome-pkg-tools
       - intltool
-      - libgee-0.8-dev
-      - libglib2.0-dev
-      - libgtk-3-dev
       - libxml2-dev
       - libsoup2.4-dev
       - libmpc-dev
       - libmpfr-dev
-      - valac
       - yelp-tools
+      - libgvc6
     stage-packages:
       - libfribidi0
     prime:
-      - "-usr/lib/gnome-calculator/libcalculator.a"
-      - "-usr/share/appdata"
-      - "-usr/share/vala"
-      - "-usr/lib/*/pkgconfig"
+      - -usr/lib/gnome-calculator/libcalculator.a
+      - -usr/share/appdata
+      - -usr/share/vala
+      - -usr/lib/*/pkgconfig
+      - -usr/lib/*/libfribid*
+      - -usr/lib/*/libgtksourceview*
+      - -usr/lib/*/girepository-1.0
+
+  # Find files provided by the base and platform snap and ensure they aren't
+  # duplicated in this snap
+  cleanup:
+    after: [gnome-calculator]
+    plugin: nil
+    build-snaps: [core18, gtk-common-themes, gnome-3-34-1804]
+    override-prime: |
+      set -eux
+      for snap in "core18" "gtk-common-themes" "gnome-3-34-1804"; do
+        cd "/snap/$snap/current" && find . -type f,l -name *.so.* -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      done