Skip to content

Commit

Permalink
Fix flatpak build
Browse files Browse the repository at this point in the history
Also, update gtksourceview dependency
  • Loading branch information
Denis Zheleztsov committed Dec 10, 2021
1 parent f48f87d commit f4fd3f3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
7 changes: 6 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ conf = configuration_data()
conf.set('package', 'Vaccine')
conf.set('version', '0.0.2')

gtksourceview = dependency('gtksourceview-3.0', required: false)
if not gtksourceview.found()
gtksourceview = dependency('gtksourceview-4')
endif

deps = [
dependency('glib-2.0', version: '>=2.44'),
dependency('gobject-2.0'),
Expand All @@ -13,7 +18,7 @@ deps = [
dependency('gee-0.8'),
dependency('gstreamer-1.0'),
dependency('gstreamer-base-1.0'),
dependency('gtksourceview-3.0'),
gtksourceview,
meson.get_compiler('c').find_library('m', required: false)
]

Expand Down
17 changes: 11 additions & 6 deletions org.vaccine.app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id": "org.vaccine.app",
"runtime": "org.gnome.Platform",
"runtime-version": "3.24",
"runtime-version": "3.38",
"sdk": "org.gnome.Sdk",
"command": "vaccine",
"finish-args": [
Expand All @@ -13,11 +13,15 @@
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"cleanup": ["*.a", "*.la", "/include"],
"cleanup": [
"*.a",
"*.la",
"/include"
],
"modules": [
{
"name": "gee-0.8",
"build-options" : {
"build-options": {
"env": {
"PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
"PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
Expand All @@ -26,17 +30,18 @@
"sources": [
{
"type": "git",
"url": "git://git.gnome.org/libgee"
"url": "https://gitlab.gnome.org/GNOME/libgee.git"
}
]
},
{
"name": "gtksourceview",
"buildsystem": "meson",
"sources": [
{
"type": "git",
"url": "git://git.gnome.org/gtksourceview",
"branch": "gnome-3-24"
"url": "https://gitlab.gnome.org/GNOME/gtksourceview.git",
"branch": "4.6.1"
}
]
},
Expand Down

0 comments on commit f4fd3f3

Please sign in to comment.