[gnome-builder] flatpak: work around gvls build failure
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: work around gvls build failure
- Date: Sat, 4 Jan 2020 19:04:13 +0000 (UTC)
commit d4a4340398500f7a74b964ff7519b695653f7acc
Author: Christian Hergert <chergert redhat com>
Date: Sat Jan 4 11:04:19 2020 -0800
flatpak: work around gvls build failure
build-aux/flatpak/gvls-fix-vapi-install-dir.patch | 22 ++++++++++++++++++++++
build-aux/flatpak/org.gnome.Builder.json | 4 ++++
2 files changed, 26 insertions(+)
---
diff --git a/build-aux/flatpak/gvls-fix-vapi-install-dir.patch
b/build-aux/flatpak/gvls-fix-vapi-install-dir.patch
new file mode 100644
index 000000000..d6e7dadf2
--- /dev/null
+++ b/build-aux/flatpak/gvls-fix-vapi-install-dir.patch
@@ -0,0 +1,22 @@
+From 14f31ee20b231ee59732eae15c8cc241ededc4d5 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert redhat com>
+Date: Sat, 4 Jan 2020 11:03:20 -0800
+Subject: [PATCH] gvls: fix vapi install dir
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 2888d6c..e47bfb8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,4 +1,4 @@
+-vapidir = join_paths (vala_dep.get_pkgconfig_variable ('datadir'),'vala','vapi')
++vapidir = join_paths (get_option('datadir'),'vala','vapi')
+ GIR_NAME= VERSIONED_CAMEL_CASE_NAME+'.gir'
+ TYPELIB_NAME= VERSIONED_CAMEL_CASE_NAME+'.typelib'
+ VAPI_NAME = VERSIONED_PROJECT_NAME+'.vapi'
+--
+2.23.0
+
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 6e4a4bf6c..2bf78b362 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -601,6 +601,10 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/esodan/gvls.git"
+ },
+ {
+ "type" : "patch",
+ "path" : "gvls-fix-vapi-install-dir.patch"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]