Initial set of changes required for publishing to Flathub #293
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| [Desktop Entry] | ||
| Type=Application | ||
| Name=${FLATPAK_APPNAME} | ||
| Icon=${FLATPAK_ID} | ||
| Exec=element %U | ||
| Categories=Network;InstantMessaging;Chat;VideoConference; | ||
| MimeType=x-scheme-handler/element; | ||
| StartupWMClass=element | ||
| Keywords=Matrix;matrix.org;chat;irc;communications;talk;riot;vector; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/bash | ||
| env TMPDIR="$XDG_RUNTIME_DIR/app/${FLATPAK_ID}" /app/element/element-desktop --no-sandbox "$@" | ||
|
There was a problem hiding this comment. I'm guessing the |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,40 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <component type="desktop"> | ||||||
| <id>${FLATPAK_ID}</id> | ||||||
| <name>${FLATPAK_APPNAME}</name> | ||||||
| <project_license>Apache-2.0</project_license> | ||||||
| <developer_name>New Vector Ltd</developer_name> | ||||||
|
There was a problem hiding this comment. This probably wants to be 'Element' (ie. the same as the author in package.json) There was a problem hiding this comment.
Suggested change
|
||||||
| <summary>Create, share, communicate, chat and call securely, and bridge to other apps</summary> | ||||||
|
There was a problem hiding this comment. We can probably find some copy for this: I would guess the "Secure and independent communication, connected via Matrix" from the homepage. There was a problem hiding this comment.
Suggested change
|
||||||
| <metadata_license>CC0-1.0</metadata_license> | ||||||
| <url type="homepage">https://element.io/</url> | ||||||
| <url type="help">https://element.io/help</url> | ||||||
| <url type="translate">https://translate.element.io/</url> | ||||||
| <description> | ||||||
| <p>More than group chat: communication</p> | ||||||
| <ul> | ||||||
| <li>Communicate with your team and out of network colleagues more efficiently: use dedicated rooms which persist information from their creation and forever.</li> | ||||||
| <li>Forget group emails: join or create rooms per topic, per team, per event… Decide the level of transparency you want to provide across the organisation or project.</li> | ||||||
| <li>Cut through the noise by creating notifications that are customised by you and for you.</li> | ||||||
| <li>Grab the attention of your colleague by calling out their name and don’t miss a thing with keyword alerts.</li> | ||||||
| <li>Deploy bots for fun or practical use with our integrations store.</li> | ||||||
| </ul> | ||||||
| </description> | ||||||
| <screenshots> | ||||||
| <screenshot> | ||||||
| <caption>Element logged-in frontend</caption> | ||||||
| <image type="source">https://user-images.githubusercontent.com/2221064/137519256-655fe0f9-55f0-44a4-b681-83711654fff0.png</image> | ||||||
| </screenshot> | ||||||
| </screenshots> | ||||||
| <releases> | ||||||
| <release version="${FLATPAK_VERSION}" date="${FLATPAK_DATE}"/> | ||||||
| </releases> | ||||||
| <content_rating type="oars-1.1"> | ||||||
| <content_attribute id="social-chat">intense</content_attribute> | ||||||
| <content_attribute id="social-audio">intense</content_attribute> | ||||||
| <content_attribute id="social-contacts">intense</content_attribute> | ||||||
| </content_rating> | ||||||
| <provides> | ||||||
| <id>im.riot.Riot</id> | ||||||
|
There was a problem hiding this comment. Are we stuck with this from historical precedent? There was a problem hiding this comment. Yes, kind of, keep in mind that this entry basically says "I provide the same capabilities as the app with the identifier |
||||||
| </provides> | ||||||
| <launchable type="desktop-id">${FLATPAK_ID}.desktop</launchable> | ||||||
| </component> | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,8 @@ | |
| "docker:install": "scripts/in-docker.sh yarn install", | ||
| "debrepo": "scripts/mkrepo.sh", | ||
| "clean": "rimraf webapp.asar dist packages deploys lib", | ||
| "hak": "ts-node scripts/hak/index.ts", | ||
| "flatpak": "yarn build && scripts/in-docker.sh scripts/build-flatpak.sh" | ||
| }, | ||
| "dependencies": { | ||
| "auto-launch": "^5.0.5", | ||
|
|
@@ -104,7 +105,7 @@ | |
| "webapp.asar" | ||
| ], | ||
| "linux": { | ||
| "target": ["deb", "dir"], | ||
| "category": "Network;InstantMessaging;Chat", | ||
| "maintainer": "[email protected]", | ||
| "desktop": { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -eu | ||
|
|
||
| : "${FLATPAK_ID:=io.element.ElementNightly}" | ||
| : "${FLATPAK_APPNAME:=Element Nightly}" | ||
| : "${FLATPAK_VERSION:="0.0.0-nightly$(date +%Y%m%d)"}" | ||
| : "${FLATPAK_DATE:="$(date +%Y-%m-%d)"}" | ||
| : "${FLATPAK_BRANCH:=nightly}" | ||
|
|
||
| export FLATPAK_ID FLATPAK_APPNAME FLATPAK_VERSION FLATPAK_DATE FLATPAK_BRANCH | ||
|
|
||
| [[ -d dist/flatpak ]] && rm -rf dist/flatpak | ||
| install -d dist/flatpak/ | ||
| install -d dist/flatpak/build/files | ||
|
|
||
| cd dist/flatpak | ||
|
|
||
| cat <<EOF > build/metadata | ||
| [Application] | ||
| name=${FLATPAK_ID} | ||
| runtime=org.freedesktop.Platform/x86_64/21.08 | ||
| sdk=org.freedesktop.Sdk/x86_64/21.08 | ||
| EOF | ||
|
|
||
| cp -r ../linux-unpacked build/files/element | ||
| install -d build/files/share/applications build/files/share/metainfo | ||
| install -Dm755 ../../build/flatpak/element.sh build/files/bin/element | ||
| install -Dm644 ../../build/icons/512x512.png build/files/share/icons/hicolor/512x512/apps/${FLATPAK_ID}.png | ||
| envsubst < ../../build/flatpak/element.desktop.in > build/files/share/applications/${FLATPAK_ID}.desktop | ||
| envsubst < ../../build/flatpak/metainfo.xml.in > build/files/share/metainfo/${FLATPAK_ID}.metainfo.xml | ||
|
|
||
| appstream-compose --prefix=build/files --origin=flatpak --basename=${FLATPAK_ID} ${FLATPAK_ID} | ||
| appstream-util mirror-screenshots build/files/share/app-info/xmls/${FLATPAK_ID}.xml.gz \ | ||
| "https://dl.flathub.org/repo/screenshots/${FLATPAK_ID}-${FLATPAK_BRANCH}" \ | ||
| build/screenshots "build/screeshots/${FLATPAK_ID}-${FLATPAK_BRANCH}" | ||
|
|
||
| # TODO: baseapp with deps | ||
| # TODO: zypak-wrapper | ||
|
|
||
| flatpak build-finish build \ | ||
| --socket=x11 \ | ||
| --share=ipc \ | ||
| --socket=pulseaudio \ | ||
| --device=all \ | ||
| --share=network \ | ||
| --filesystem=xdg-download \ | ||
| --talk-name=org.freedesktop.Notifications \ | ||
| --talk-name=org.kde.StatusNotifierWatcher \ | ||
| --talk-name=org.freedesktop.ScreenSaver \ | ||
| --own-name='org.kde.*' \ | ||
| --talk-name=org.freedesktop.portal.Fcitx \ | ||
| --filesystem=xdg-run/keyring \ | ||
| --command=element | ||
|
|
||
| flatpak build-export repo build $FLATPAK_BRANCH | ||
| flatpak build-update-repo --generate-static-deltas repo | ||
| flatpak build-bundle --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo \ | ||
| repo ../element.flatpak $FLATPAK_ID $FLATPAK_BRANCH |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
builddirectory is (confusingly) for electron-builder's config, so we should keep things unrelated to electron builder somewhere else. Probably just a top-levelflatpakdirectory?