Skip to content
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

flatpak updates #824

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

flatpak updates #824

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4a1a41
ci: Use JSON instead of YAML
tintou Mar 3, 2023
229ed02
Update flatpak dependencies
tintou Mar 3, 2023
7ccd0de
MessageListItem: avoid crashing on empty Mime
tintou Mar 3, 2023
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
30 changes: 9 additions & 21 deletions io.elementary.mail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id": "io.elementary.mail",
"runtime": "io.elementary.Platform",
"runtime-version": "7",
"runtime-version": "7.1",
"sdk": "io.elementary.Sdk",
"command": "io.elementary.mail",
"finish-args": [
Expand All @@ -12,7 +12,9 @@
"--socket=fallback-x11",
"--socket=wayland",
"--talk-name=org.gnome.evolution.dataserver.AddressBook10",
"--talk-name=org.gnome.evolution.dataserver.Calendar8",
"--talk-name=org.gnome.evolution.dataserver.Sources5",
"--talk-name=org.gnome.evolution.dataserver.UserPrompter0",
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think mail uses the Calendar and UserPrompter Services. don't need to expose them to the sandbox.

"--metadata=X-DConf=migrate-path=/io/elementary/mail/"
],
"cleanup": [
Expand All @@ -38,6 +40,7 @@
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DENABLE_EXAMPLES=OFF",
"-DENABLE_GOA=OFF",
"-DENABLE_GTK4=OFF",
"-DWITH_LIBDB=OFF",
"-DENABLE_WEATHER=OFF",
"-DENABLE_CANBERRA=OFF",
Expand All @@ -50,7 +53,7 @@
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"tag": "3.40.2"
"branch": "3.46.4"
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this is a tag, not a branch. Also, maybe it's better to keep the version here and in the OS in sync since we aren't really using the server from the sandbox.

}
],
"modules": [
Expand All @@ -67,21 +70,6 @@
}
]
},
{
"name": "libgdata",
"buildsystem": "meson",
"config-opts": [
"-Dalways_build_tests=false",
"-Dgoa=disabled"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libgdata.git",
"tag": "0.18.0"
}
]
},
{
"name": "libical",
"cleanup": [
Expand All @@ -101,10 +89,10 @@
],
"sources": [
{
"type": "git",
"url": "https://github.com/libical/libical.git",
"tag": "v3.0.9"
}
"type": "archive",
"url": "https://github.com/libical/libical/releases/download/v3.0.16/libical-3.0.16.tar.gz",
"sha256": "b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33"
}
Comment on lines +92 to +95
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason to prefer the archive over the git repo? if so, wouldn't be better to use archive for all dependencies?

Also, there's a extra space before the close brace.

Copy link
Member Author

Choose a reason for hiding this comment

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

Flatpak is way more efficient when dealing with archives than git repositories (it only has to look at if the file is newer on the server before downloading it)

]
}
]
Expand Down