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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
with:
bundle: mail.flatpak
manifest-path: io.elementary.mail.yml
manifest-path: io.elementary.mail.json
run-tests: true
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
with:
bundle: mail.flatpak
manifest-path: io.elementary.mail.yml
manifest-path: io.elementary.mail.json
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
Expand Down
129 changes: 129 additions & 0 deletions io.elementary.mail.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"app-id": "io.elementary.mail",
"runtime": "io.elementary.Platform",
"runtime-version": "7.1",
"sdk": "io.elementary.Sdk",
"command": "io.elementary.mail",
"finish-args": [
"--filesystem=/tmp/io.elementary.mail:create",
"--env=TMPDIR=/tmp/io.elementary.mail",
"--share=ipc",
"--share=network",
"--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",
"--metadata=X-DConf=migrate-path=/io/elementary/mail/"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/share/vala",
"*.a",
"*.la"
],
"modules": [
{
"name": "evolution-data-server",
"buildsystem": "cmake-ninja",
"cleanup": [
"/etc",
"/lib/evolution-data-server/*-backends",
"/libexec",
"/share/dbus-1",
"/share/GConf",
"/share/pixmaps"
],
"config-opts": [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DENABLE_EXAMPLES=OFF",
"-DENABLE_GOA=OFF",
"-DENABLE_GTK4=OFF",
"-DWITH_LIBDB=OFF",
"-DENABLE_WEATHER=OFF",
"-DENABLE_CANBERRA=OFF",
"-DENABLE_VALA_BINDINGS=ON",
"-DWITH_KRB5=OFF",
"-DWITH_OPENLDAP=OFF",
"-DENABLE_INTROSPECTION=ON"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"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": [
{
"name": "intltool",
"cleanup": [
"*"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
"md5": "12e517cac2b57a0121cda351570f1e63"
}
]
},
{
"name": "libical",
"cleanup": [
"/lib/cmake",
"/libexec"
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DCMAKE_INSTALL_LIBDIR=/app/lib",
"-DWITH_CXX_BINDINGS=false",
"-DSHARED_ONLY=true",
"-DGOBJECT_INTROSPECTION=true",
"-DICAL_BUILD_DOCS=false",
"-DICAL_GLIB_VAPI=true",
"-DLIBICAL_BUILD_TESTING=false"
],
"sources": [
{
"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)

]
}
]
},
{
"name": "folks",
"buildsystem": "meson",
"config-opts": [
"-Dbluez_backend=false",
"-Dofono_backend=false",
"-Dtelepathy_backend=false",
"-Dimport_tool=false",
"-Dinspect_tool=false"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/folks.git",
"tag": "0.15.5"
}
]
},
{
"name": "mail",
"buildsystem": "meson",
"sources": [
{
"type": "dir",
"path": "."
}
]
}
]
}
104 changes: 0 additions & 104 deletions io.elementary.mail.yml

This file was deleted.

4 changes: 4 additions & 0 deletions src/MessageList/MessageListItem.vala
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,10 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {

private async void open_message (Camel.MimeMessage message) {
yield parse_mime_content (message.content);
if (message_content == null) {
return;
}

if (message_is_html) {
web_view.load_html (message_content);
} else {
Expand Down