Merge pull request #25 from vchernin/beta-update

Update beta to latest release candidate
flathub · Jun 10, 2021 · 2364bc7 · 2364bc7
2 parents 35c47e9 + 97601c0
commit 2364bc7
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 ## Prerequisites
 
 ```
-$ flatpak install flathub org.freedesktop.Sdk//18.08
-$ flatpak install flathub io.atom.electron.BaseApp//18.08
+$ flatpak install flathub org.freedesktop.Sdk//19.08
+$ flatpak install flathub io.atom.electron.BaseApp//19.08
 ```
 
 ## Build to local repository, install

diff --git a/com.mattermost.Desktop.appdata.xml b/com.mattermost.Desktop.appdata.xml
@@ -29,7 +29,19 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="4.6.2" date="2021-01-25"/>
+    <release version="4.6.1" date="2020-10-26"/>
+    <release version="4.6.0" date="2020-10-16"/>
+    <release version="4.5.3" date="2020-08-25"/>
+    <release version="4.5.2" date="2020-07-20"/>
+    <release version="4.5.0" date="2020-06-16"/>
+    <release version="4.4.1" date="2020-04-22"/>
+    <release version="4.4.0" date="2020-02-19"/>
+    <release version="4.3.2" date="2019-11-29"/>
+    <release version="4.3.1" date="2019-10-22"/>
     <release version="4.3.0" date="2019-10-17"/>
+    <release version="4.2.3" date="2019-08-09"/>
+    <release version="4.2.2" date="2019-08-07"/>
     <release version="4.2.1" date="2019-03-20"/>
     <release version="4.2.0" date="2018-11-26"/>
     <release version="4.1.2" date="2018-05-25"/>

diff --git a/com.mattermost.Desktop.desktop b/com.mattermost.Desktop.desktop
@@ -5,5 +5,6 @@ Exec=mattermost-flatpak
 Terminal=false
 Type=Application
 Icon=com.mattermost.Desktop
+StartupWMClass=Mattermost
 Categories=Network;InstantMessaging;
 
diff --git a/com.mattermost.Desktop.json b/com.mattermost.Desktop.json
@@ -1,9 +1,9 @@
 {
     "app-id": "com.mattermost.Desktop",
-    "base": "io.atom.electron.BaseApp",
-    "base-version": "18.08",
+    "base": "org.electronjs.Electron2.BaseApp",
+    "base-version": "20.08",
     "runtime": "org.freedesktop.Platform",
-    "runtime-version": "18.08",
+    "runtime-version": "20.08",
     "sdk": "org.freedesktop.Sdk",
     "command": "mattermost-flatpak",
     "separate-locales": false,
@@ -14,7 +14,9 @@
         "--share=network",
         "--device=dri",
         "--filesystem=home",
-        "--talk-name=org.freedesktop.Notifications"
+        "--talk-name=org.freedesktop.Notifications",
+        "--talk-name=org.kde.StatusNotifierWatcher",
+        "--talk-name=com.canonical.AppMenu.Registrar"
     ],
     "modules": [
         {
@@ -26,26 +28,29 @@
                 "install mattermost.sh /app/bin/mattermost-flatpak",
                 "install -Dm644 com.mattermost.Desktop.desktop /app/share/applications/com.mattermost.Desktop.desktop",
                 "install -Dm644 com.mattermost.Desktop.appdata.xml /app/share/appdata/com.mattermost.Desktop.appdata.xml",
-                "install -Dm644 /app/main/icon.svg /app/share/icons/hicolor/scalable/apps/com.mattermost.Desktop.svg"
+                "install -Dm644 icon.svg /app/share/icons/hicolor/scalable/apps/com.mattermost.Desktop.svg"
             ],
             "sources" : [
                 {
                     "type": "script",
                     "dest-filename": "mattermost.sh",
-                    "commands": ["exec /app/main/mattermost-desktop --no-sandbox \"$@\""]
+                    "commands": [
+                        "export TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"",
+                        "exec zypak-wrapper /app/main/mattermost-desktop \"$@\""
+                    ]
                 },
                 {
                     "type": "archive",
                     "only-arches": ["x86_64"],
-                    "url": "https://releases.mattermost.com/desktop/4.3.0/mattermost-desktop-4.3.0-linux-x64.tar.gz",
-                    "sha256": "1ad46b20dccbcc03d102f2ff82d1ffa01919c6aedd0bd7aaab0b4d0b99fee10f",
+                    "url": "https://releases.mattermost.com/desktop/4.7.0-rc5/mattermost-desktop-4.7.0-rc5-linux-x64.tar.gz",
+                    "sha256": "b6661af4561e2f87af7552a63e8f26ab2014d7cc7f5ab4b8d130ef46519b352a",
                     "dest": "main"
                 },
                 {
                     "type": "archive",
                     "only-arches": ["i386"],
-                    "url": "https://releases.mattermost.com/desktop/4.3.0/mattermost-desktop-4.3.0-linux-ia32.tar.gz",
-                    "sha256": "24a6de5914833c20e59ff0d2ae121530bb6735f7350eedd425a687a5b6e65e0a",
+                    "url": "https://releases.mattermost.com/desktop/4.7.0-rc5/mattermost-desktop-4.7.0-rc5-linux-ia32.tar.gz",
+                    "sha256": "b33dab07f57b378eb42dd35f8124727009f9c2a82cc6d26e4b039ed4b0e8faab",
                     "dest": "main"
                 },
                 {
@@ -58,8 +63,12 @@
                 },
                 {
                     "type": "file",
-                    "url": "https://github.com/mattermost/desktop/archive/v4.3.0.tar.gz",
-                    "sha256": "9964f7e722803760ab6186c8b62567d9fc9248eccec97beca006a3d2735d9a0e"
+                    "path": "icon.svg"
+                },
+                {
+                    "type": "file",
+                    "url": "https://github.com/mattermost/desktop/archive/v4.7.0-rc5.tar.gz",
+                    "sha256": "d7cc1f8bf30ae1a83a9c35e5f2464df747ca99ad6f0c84f72836d2b27ac613a4"
                 }
             ]
         }

diff --git a/icon.svg b/icon.svg