[fractal] Fix and update libhandy dependency
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] Fix and update libhandy dependency
- Date: Tue, 10 Nov 2020 07:48:44 +0000 (UTC)
commit 86e507739cbbb185e672433d244f1a4509000251
Author: Alejandro DomÃnguez <adomu net-c com>
Date: Tue Nov 10 00:44:22 2020 +0100
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.
flatpak/org.gnome.Fractal-release.json | 4 ++--
flatpak/org.gnome.Fractal.json | 19 -------------------
meson.build | 2 +-
subprojects/libhandy.wrap | 4 ----
4 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/flatpak/org.gnome.Fractal-release.json b/flatpak/org.gnome.Fractal-release.json
index 32cd1a29..a3fe92a7 100644
--- a/flatpak/org.gnome.Fractal-release.json
+++ b/flatpak/org.gnome.Fractal-release.json
@@ -53,8 +53,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://source.puri.sm/Librem5/libhandy",
- "tag" : "v0.0.13"
+ "url" : "https://gitlab.gnome.org/GNOME/libhandy",
+ "tag" : "1.0.1"
}
]
},
diff --git a/flatpak/org.gnome.Fractal.json b/flatpak/org.gnome.Fractal.json
index a1eec33d..fcb2db40 100644
--- a/flatpak/org.gnome.Fractal.json
+++ b/flatpak/org.gnome.Fractal.json
@@ -44,25 +44,6 @@
"mkdir -p /app/lib/ffmpeg"
],
"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",
"config-opts" : [
diff --git a/meson.build b/meson.build
index 027f94f3..529c7ab9 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ dependency('gio-2.0', version: '>= 2.56')
dependency('cairo', version: '>= 1.16')
dependency('gdk-pixbuf-2.0')
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('gspell-1', version: '>= 1.8')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]