Fix and update libhandy dependency

The wrapper crate required >= 1.0 so it didn't build on release.
That made the meson wrapper unnecessary.

On nightly org.gnome.Platform bundles libhandy so it's not needed
as a flatpak manifest module anymore.
This commit is contained in:
Alejandro Domínguez 2020-11-10 00:44:22 +01:00 committed by Daniel Garcia Moreno
parent 16a9efd6c3
commit 86e507739c
4 changed files with 3 additions and 26 deletions

View file

@ -53,8 +53,8 @@
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://source.puri.sm/Librem5/libhandy", "url" : "https://gitlab.gnome.org/GNOME/libhandy",
"tag" : "v0.0.13" "tag" : "1.0.1"
} }
] ]
}, },

View file

@ -44,25 +44,6 @@
"mkdir -p /app/lib/ffmpeg" "mkdir -p /app/lib/ffmpeg"
], ],
"modules" : [ "modules" : [
{
"name" : "libhandy",
"buildsystem" : "meson",
"config-opts" : [
"-Dprofiling=false",
"-Dintrospection=enabled",
"-Dgtk_doc=false",
"-Dtests=false",
"-Dexamples=false",
"-Dvapi=false",
"-Dglade_catalog=disabled"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libhandy.git"
}
]
},
{ {
"name" : "gspell", "name" : "gspell",
"config-opts" : [ "config-opts" : [

View file

@ -12,7 +12,7 @@ dependency('gio-2.0', version: '>= 2.56')
dependency('cairo', version: '>= 1.16') dependency('cairo', version: '>= 1.16')
dependency('gdk-pixbuf-2.0') dependency('gdk-pixbuf-2.0')
dependency('gtk+-3.0', version: '>= 3.24.7') dependency('gtk+-3.0', version: '>= 3.24.7')
dependency('libhandy-1', version: '>= 1.0.0', fallback: ['libhandy', 'libhandy_dep']) dependency('libhandy-1', version: '>= 1.0.0')
dependency('gtksourceview-4', version: '>= 4.0') dependency('gtksourceview-4', version: '>= 4.0')
dependency('gspell-1', version: '>= 1.8') dependency('gspell-1', version: '>= 1.8')

View file

@ -1,4 +0,0 @@
[wrap-git]
directory = libhandy
url=https://gitlab.gnome.org/GNOME/libhandy.git
revision=origin/master