[gnome-characters] [snap] Updated snap packaging to build with meson



commit 1d2b78a53b7c4929774eaf098a46c5f2635bd0df
Author: Ken VanDine <ken vandine org>
Date:   Thu Aug 2 09:20:47 2018 -0400

    [snap] Updated snap packaging to build with meson

 snap/snapcraft.yaml | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b393abb..82631de 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -12,7 +12,19 @@ plugs:
   gnome-3-26-1604:
     interface: content
     target: $SNAP/gnome-platform
-    default-provider: gnome-3-26-1604:gnome-3-26-1604
+    default-provider: gnome-3-26-1604
+  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
 
 slots:
   # for GtkApplication registration
@@ -40,9 +52,8 @@ apps:
 parts:
   iso-codes:
     after: [desktop-gnome-platform]
-    source: https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.75.tar.xz
+    source: https://ftp.osuosl.org/pub/blfs/conglomeration/iso-codes/iso-codes-3.77.tar.xz
     plugin: autotools
-    # workaround the issue described in https://launchpad.net/bugs/1583250
     configflags: [--prefix=/snap/gnome-characters/current/usr]
     organize:
       snap/gnome-characters/current/usr: usr
@@ -52,13 +63,13 @@ parts:
       - python3
   gnome-desktop:
     after: [iso-codes]
-    source: https://git.gnome.org/browse/gnome-desktop
+    source: https://gitlab.gnome.org/GNOME/gnome-desktop.git
     source-type: git
     source-tag: 3.26.0
     plugin: autotools
-    prepare:
+    override-build: |
       sed -i.bak -e 's|.*ISO_CODES_PREFIX=.*|ISO_CODES_PREFIX=/snap/gnome-characters/current/usr|g' 
configure.ac
-    # workaround the issue described in https://launchpad.net/bugs/1583250
+      snapcraftctl build
     configflags: [--prefix=/snap/gnome-characters/current/usr, --disable-date-in-gnome-version, 
--with-gnome-distributor=Ubuntu]
     organize:
       snap/gnome-characters/current/usr: usr
@@ -67,7 +78,6 @@ parts:
       - libglib2.0-dev
       - gnome-common
       - intltool
-      - gnome-pkg-tools
       - gtk-doc-tools
       - docbook-xml
       - libx11-dev
@@ -87,16 +97,15 @@ parts:
   gnome-characters:
     after: [gnome-desktop]
     source: .
-    source-type: git
-    plugin: autotools
-    configflags: [--prefix=/snap/gnome-characters/current/usr]
+    plugin: meson
+    meson-parameters: [--prefix=/snap/gnome-calculator/current/usr]
     organize:
       snap/gnome-characters/current/usr: usr
-    prepare: |
+    override-build: |
       sed -i.bak -e 's|=gnome-characters$|=${SNAP}/meta/gui/gnome-characters.png|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
-    install: |
+      snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
       cp ../src/data/icons/hicolor/256x256/apps/gnome-characters.png $SNAPCRAFT_PART_INSTALL/meta/gui/
     build-attributes: ['no-system-libraries']
@@ -107,7 +116,6 @@ parts:
       - gsettings-desktop-schemas-dev
       - intltool
       - appstream-util
-      - gnome-pkg-tools
       - pkg-config
       - libglib2.0-dev
       - libgtk-3-dev
@@ -126,8 +134,10 @@ parts:
       - gir1.2-glib-2.0
       - gir1.2-gtk-3.0
       - gir1.2-gnomedesktop-3.0
+      - libreadline6
     prime:
       - "usr/bin/gjs*"
       - "usr/lib/*/girepository-1.0*"
       - "usr/lib/*/libmozjs*"
       - "usr/lib/*.*"
+      - "lib/*/libreadline.so*"


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