Skip to content

Fix flatpak build #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Difrex wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flatpak build #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion meson.build
View file
Open in desktop
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()
Copy link
Copy Markdown
Member

@Prince781 Prince781 Dec 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think dependency('gtksourceview-3.0', fallback: ['gtksourceview-4']) would look cleaner, and keep it inline with the other things in deps

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'),
Comment thread
Difrex marked this conversation as resolved.
gtksourceview,
meson.get_compiler('c').find_library('m', required: false)
]

Expand Down
17 changes: 11 additions & 6 deletions org.vaccine.app.json
View file
Open in desktop
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