[gnome-characters/gnome-3-32] snap: Updated to use the latest snapcraft extension



commit 9d1e91d06cf08209f54f14327420ca74723369b9
Author: Ken VanDine <ken vandine canonical com>
Date:   Wed May 6 12:55:46 2020 -0400

    snap: Updated to use the latest snapcraft extension

 snap/snapcraft.yaml | 86 ++++++-----------------------------------------------
 1 file changed, 9 insertions(+), 77 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 34c2b7c..6588dad 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,31 +1,13 @@
 name: gnome-characters
 version: git
-summary: A character map application
-description: |
-  Characters is a simple utility application to find and
-  insert unusual characters.
-
+adopt-info: gnome-characters
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
 base: core18
 
-plugs:
-  gnome-3-28-1804:
-    interface: content
-    target: $SNAP/gnome-platform
-    default-provider: gnome-3-28-1804
-  gtk-3-themes:
-    interface: content
-    target: $SNAP/data-dir/themes
-    default-provider: gtk-common-themes
-  icon-themes:
-    interface: content
-    target: $SNAP/data-dir/icons
-    default-provider: gtk-common-themes
-  sound-themes:
-    interface: content
-    target: $SNAP/data-dir/sounds
-    default-provider: gtk-common-themes
+layout:
+  /usr/bin/gjs:
+    symlink: $SNAP/gnome-platform/usr/bin/gjs
 
 slots:
   # for GtkApplication registration
@@ -36,84 +18,34 @@ slots:
 
 apps:
   gnome-characters:
-    command: desktop-launch ${SNAP}/usr/share/org.gnome.Characters/org.gnome.Characters
+    command: usr/share/org.gnome.Characters/org.gnome.Characters
+    extensions: [gnome-3-34]
     plugs:
       - browser-support
-      - desktop
-      - desktop-legacy
       - gsettings
       - home
-      - unity7
-      - wayland
     desktop: usr/share/applications/org.gnome.Characters.desktop
     common-id: org.gnome.Characters.desktop
     environment:
-      GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
-      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/org.gnome.Characters
+      LD_LIBRARY_PATH: 
$LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/org.gnome.Characters:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/gnome-platform/usr/lib:$SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
+      GI_TYPELIB_PATH: 
$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/org.gnome.Characters/girepository-1.0:$SNAP/usr/lib/gjs/girepository-1.0:$SNAP/gnome-platform/usr/lib/girepository-1.0:$SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/girepository-1.0
 
 parts:
-  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
   gnome-characters:
-    after: [desktop-gnome-platform]
     source-type: git
     source: .
     plugin: meson
     meson-parameters: [--buildtype=release, --prefix=/snap/gnome-characters/current/usr]
+    parse-info: [usr/share/metainfo/org.gnome.Characters.appdata.xml]
     organize:
       snap/gnome-characters/current/usr: usr
     override-pull: |
       snapcraftctl pull
-      sed -i.bak -e 's|=@appid@$|=${SNAP}/meta/gui/org.gnome.Characters.svg|g' 
data/org.gnome.Characters.desktop.in
       sed -i.bak -e 
's|=@bindir@/gnome-characters$|=${SNAP}/usr/share/org.gnome.Characters/org.gnome.Characters|g' 
data/org.gnome.Characters.desktop.in
-      sed -i.bak -e 's|@GJS@|/snap/gnome-characters/current/usr/bin/gjs|g' src/org.gnome.Characters.in
-      sed -i.bak -e 's|@GJS@|/snap/gnome-characters/current/usr/bin/gjs|g' 
src/org.gnome.Characters.BackgroundService.in
     override-build: |
       snapcraftctl build
-      mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp ../src/data/icons/hicolor/scalable/apps/org.gnome.Characters.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
       rm -f $SNAPCRAFT_PART_INSTALL/snap/gnome-characters/current/usr/bin/gnome-characters
     build-packages:
       - desktop-file-utils
-      - gettext
-      - gsettings-desktop-schemas-dev
-      - itstool
-      - appstream-util
-      - libglib2.0-dev
-      - libgtk-3-dev
-      - libgirepository1.0-dev
-      - libgjs-dev
-      - gjs
       - gperf
-      - libgdk-pixbuf2.0-dev
-      - libpango1.0-dev
       - libunistring-dev
-
-  libraries:
-    plugin: nil
-    stage-packages:
-      - gjs
-      - gir1.2-gdkpixbuf-2.0
-      - gir1.2-glib-2.0
-      - gir1.2-gtk-3.0
-      - gir1.2-gnomedesktop-3.0
-      - libreadline5
-      - libunistring2
-      - fonts-noto-color-emoji
-    prime:
-      - "usr/bin/gjs*"
-      - "usr/lib/*/girepository-1.0*"
-      - "usr/lib/*/libmozjs*"
-      - "usr/lib/*.*"
-      - "lib/*/libreadline.so*"
-      - "usr/lib/*/libunistring.so*"
-      - "usr/share/fonts/truetype/noto"


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