snap: use newer json-glib (Fixes: #4099)

This commit is contained in:
Mario Limonciello 2021-12-16 11:44:46 -06:00 committed by Mario Limonciello
parent 3356d8a844
commit ec90ebc20c

View File

@ -74,7 +74,7 @@ parts:
after: [nettle]
meson:
plugin: python
source: https://github.com/mesonbuild/meson/releases/download/0.54.0/meson-0.54.0.tar.gz
source: https://github.com/mesonbuild/meson/releases/download/0.60.2/meson-0.60.2.tar.gz
build-packages:
- ninja-build
- python3-distutils-extra
@ -128,6 +128,21 @@ parts:
- -lib/systemd
- -lib/udev
- -lib/girepository-1.0
json-glib:
plugin: meson
source: https://gitlab.gnome.org/GNOME/json-glib.git
source-tag: 1.6.6
after: [meson]
meson-parameters: [--prefix=/,
-Dgtk_doc=disabled,
-Dintrospection=disabled,
-Dman=false,
-Dtests=false]
prime:
- -include
- -bin
- -lib/*/pkgconfig
- -share
libqmi:
plugin: autotools
source: https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
@ -205,7 +220,6 @@ parts:
- libgcab-dev
- libglib2.0-dev
- libgpgme11-dev
- libjson-glib-dev
- liblzma-dev
- libpango1.0-dev
- libpci-dev
@ -230,7 +244,6 @@ parts:
- libusb-1.0-0
- libgudev-1.0-0
- libgpgme11
- libjson-glib-1.0-0
- libpolkit-gobject-1-0
- libsmbios-c2
- glib-networking
@ -272,7 +285,7 @@ parts:
- -usr/lib/*/pkgconfig
# we don't want system gnutls leaking in
- -usr/lib/*/libgnutls*
after: [meson, build-introspection, modemmanager, libmbim, libqmi, tpm2-tss, gnutls, curl]
after: [meson, build-introspection, modemmanager, libmbim, libqmi, tpm2-tss, gnutls, curl, json-glib]
fix-bash-completion:
plugin: make
source: contrib/snap/fix-bash-completion