From 1e7a1feac412b4bb2426da07ee65c15925e559f9 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 08:12:16 +0800 Subject: [PATCH 01/32] add flatpak --- .github/workflows/manual-build.yml | 36 ++++++++++++ dist/flatpak/icon.svg | 16 ++++++ dist/flatpak/one.mixin.messenger.desktop | 10 ++++ dist/flatpak/one.mixin.messenger.desktop.json | 55 +++++++++++++++++++ dist/flatpak/one.mixin.messenger.desktop.yaml | 19 +++++++ dist/linux_flatpak.sh | 12 ++++ 6 files changed, 148 insertions(+) create mode 100644 dist/flatpak/icon.svg create mode 100644 dist/flatpak/one.mixin.messenger.desktop create mode 100644 dist/flatpak/one.mixin.messenger.desktop.json create mode 100644 dist/flatpak/one.mixin.messenger.desktop.yaml create mode 100755 dist/linux_flatpak.sh diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 16bf918636..d271ef2a7f 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -38,6 +38,15 @@ jobs: - name: Build APP run: flutter build linux + - name: Compress Flutter build + run: tar -C build/linux/x64/release/bundle -cvf mixin-desktop-linux-portable.tar.gz . + + - name: Upload app archive for next steps + uses: actions/upload-artifact@v2 + with: + name: mixin-desktop-linux-portable-archive + path: mixin-desktop-linux-portable.tar.gz + - name: Prepare snap build run: ./dist/linux_snap_prepare.sh @@ -73,6 +82,33 @@ jobs: name: AppImage path: './*.AppImage*' + build-linux-flatpak: + needs: build-linux + runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08 + options: --privileged + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Download app archive + uses: actions/download-artifact@v3 + with: + name: mixin-desktop-linux-portable-archive + + - name: Build .flatpak + uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + with: + bundle: FlutterApp.flatpak + manifest-path: dist/flatpak/one.mixin.messenger.desktop.json + + - name: Upload .flatpak artifact to workflow + uses: actions/upload-artifact@v2 + with: + name: Flatpak artifact + path: FlutterApp.flatpak + build-windows: runs-on: windows-latest steps: diff --git a/dist/flatpak/icon.svg b/dist/flatpak/icon.svg new file mode 100644 index 0000000000..9f8c2888b6 --- /dev/null +++ b/dist/flatpak/icon.svg @@ -0,0 +1,16 @@ + + + 1024*1024备份 3 + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/flatpak/one.mixin.messenger.desktop b/dist/flatpak/one.mixin.messenger.desktop new file mode 100644 index 0000000000..61acb6a1a9 --- /dev/null +++ b/dist/flatpak/one.mixin.messenger.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Mixin Messenger +Comment=An encrypted messenger with Signal protocol and cryptocurrency wallet +GenericName=Internet Messenger +Categories=InstantMessaging +Version=1.0 +Exec=mixin_desktop +Terminal=false +Icon=mixin_desktop diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json new file mode 100644 index 0000000000..1e2506e1db --- /dev/null +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -0,0 +1,55 @@ +{ + "app-id": "one.mixin.messenger.desktop", + "runtime": "org.freedesktop.Platform", + "runtime-version": "21.08", + "sdk": "org.freedesktop.Sdk", + "command": "mixin_desktop", + "separate-locales": false, + "finish-args": [ + "--share=ipc", + "--socket=fallback-x11", + "--socket=wayland", + "--device=dri", + "--socket=pulseaudio", + "--share=network" + ], + "modules": [ + { + "name": "mixin_desktop", + "buildsystem": "simple", + "only-arches": [ + "x86_64" + ], + "build-commands": [ + "mkdir -p FlutterApp", + "tar -xf mixin-linux-portable.tar.gz -C FlutterApp", + "cp -r FlutterApp /app/", + "chmod +x /app/FlutterApp/mixin_desktop", + "mkdir -p /app/bin", + "ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop", + "mkdir -p /app/share/metainfo", + "cp -r one.mixin.messenger.metainfo.xml /app/share/metainfo/", + "mkdir -p /app/share/icons/hicolor/scalable/apps", + "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/one.mixin.messenger.desktop.svg", + "mkdir -p /app/share/applications", + "cp -r one.mixin.messenger.desktop /app/share/applications/", + "mkdir -p /app/share/appdata", + "cp -r one.mixin.messenger.metainfo.xml /app/share/appdata/" + ], + "sources": [ + { + "type": "file", + "path": "one.mixin.messenger.desktop" + }, + { + "type": "file", + "path": "icon.svg" + }, + { + "type": "file", + "path": "mixin-linux-portable.tar.gz" + } + ] + } + ] + } \ No newline at end of file diff --git a/dist/flatpak/one.mixin.messenger.desktop.yaml b/dist/flatpak/one.mixin.messenger.desktop.yaml new file mode 100644 index 0000000000..0283826932 --- /dev/null +++ b/dist/flatpak/one.mixin.messenger.desktop.yaml @@ -0,0 +1,19 @@ +app-id: org.flatpak.Hello +runtime: org.freedesktop.Platform +runtime-version: '21.08' +sdk: org.freedesktop.Sdk +command: mixin_desktop +modules: + - name: hello + buildsystem: simple + build-commands: + - mkdir -p /app/mixin_desktop + - tar -xf mixin-linux-portable.tar.gz -C /app/mixin_desktop + - chmod +x /app/mixin_desktop/mixin_desktop + - mkdir -p /app/bin + - ln -s /app/mixin_desktop/mixin_desktop /app/bin/mixin_desktop + sources: + - type: file + path: icon.svg + - type: file + path: mixin-linux-portable.tar.gz \ No newline at end of file diff --git a/dist/linux_flatpak.sh b/dist/linux_flatpak.sh new file mode 100755 index 0000000000..826fe100f7 --- /dev/null +++ b/dist/linux_flatpak.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +current_dir=$(dirname "$0") +project_dir="${current_dir}/.." + + +rm "$project_dir/dist/flatpak/mixin-linux-portable.tar.gz" +tar -C "${project_dir}/build/linux/x64/release/bundle" -cvf mixin-linux-portable.tar.gz . + +pushd "$project_dir/dist/flatpak" || exit +flatpak-builder --force-clean build-dir one.mixin.messenger.desktop.yaml +popd || exit \ No newline at end of file From 9b6e20a495187660ab63468d8a61a5919e8b5298 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 08:13:18 +0800 Subject: [PATCH 02/32] test build --- .github/workflows/manual-build.yml | 72 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index d271ef2a7f..52437554a2 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -9,6 +9,7 @@ on: description: "run with flutter channel, eg: master, beta, stable" required: true default: "master" + push: jobs: build-linux: @@ -17,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - channel: '${{ github.event.inputs.flutter_channel }}' # 'master', 'beta', 'dev' or 'stable' + channel: master # 'master', 'beta', 'dev' or 'stable' # flutter build need ninja. # https://github.com/subosito/flutter-action/issues/49 @@ -47,40 +48,40 @@ jobs: name: mixin-desktop-linux-portable-archive path: mixin-desktop-linux-portable.tar.gz - - name: Prepare snap build - run: ./dist/linux_snap_prepare.sh - - - uses: snapcore/action-build@v1 - id: build-snap - with: - snapcraft-args: '--enable-experimental-extensions' - path: dist/snap - - - uses: actions/upload-artifact@v3 - with: - name: mixin-desktop-snap - path: ${{ steps.build-snap.outputs.snap }} - - - name: Package APP - run: ./dist/linux_deb.sh - - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: mixin_desktop_amd64.deb.zip - path: build/mixin_desktop_amd64.deb - - - name: Build AppImage unsing appimage-builder - uses: docker://appimagecrafters/appimage-builder:0.9.1 - with: - entrypoint: appimage-builder - args: --recipe ./AppImageBuilder.yml --skip-test - - - name: Upload AppImage Artifact - uses: actions/upload-artifact@v2 - with: - name: AppImage - path: './*.AppImage*' +# - name: Prepare snap build +# run: ./dist/linux_snap_prepare.sh +# +# - uses: snapcore/action-build@v1 +# id: build-snap +# with: +# snapcraft-args: '--enable-experimental-extensions' +# path: dist/snap +# +# - uses: actions/upload-artifact@v3 +# with: +# name: mixin-desktop-snap +# path: ${{ steps.build-snap.outputs.snap }} +# +# - name: Package APP +# run: ./dist/linux_deb.sh +# +# - name: Upload Artifact +# uses: actions/upload-artifact@v2 +# with: +# name: mixin_desktop_amd64.deb.zip +# path: build/mixin_desktop_amd64.deb +# +# - name: Build AppImage unsing appimage-builder +# uses: docker://appimagecrafters/appimage-builder:0.9.1 +# with: +# entrypoint: appimage-builder +# args: --recipe ./AppImageBuilder.yml --skip-test +# +# - name: Upload AppImage Artifact +# uses: actions/upload-artifact@v2 +# with: +# name: AppImage +# path: './*.AppImage*' build-linux-flatpak: needs: build-linux @@ -111,6 +112,7 @@ jobs: build-windows: runs-on: windows-latest + if: false steps: - uses: actions/checkout@v3 From 60e118906405350d91a34cbd3e0a24da40bbe206 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 08:32:43 +0800 Subject: [PATCH 03/32] fix --- .github/workflows/manual-build.yml | 1 + dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 52437554a2..2c2c8c1282 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -97,6 +97,7 @@ jobs: uses: actions/download-artifact@v3 with: name: mixin-desktop-linux-portable-archive + path: dist/flatpak - name: Build .flatpak uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 1e2506e1db..9df397296c 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -22,7 +22,7 @@ ], "build-commands": [ "mkdir -p FlutterApp", - "tar -xf mixin-linux-portable.tar.gz -C FlutterApp", + "tar -xf mixin-desktop-linux-portable.tar.gz -C FlutterApp", "cp -r FlutterApp /app/", "chmod +x /app/FlutterApp/mixin_desktop", "mkdir -p /app/bin", From ba1d067aea92f441608163324f4d39c63102dd0b Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 08:41:59 +0800 Subject: [PATCH 04/32] fix --- dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 9df397296c..4fe47bea08 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -47,7 +47,7 @@ }, { "type": "file", - "path": "mixin-linux-portable.tar.gz" + "path": "mixin-desktop-linux-portable.tar.gz" } ] } From 8e71dd9268edeca09d2629f5297480a0b4bffa47 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 08:56:31 +0800 Subject: [PATCH 05/32] add meta info --- .../one.mixin.messenger.desktop.metainfo.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 dist/flatpak/one.mixin.messenger.desktop.metainfo.xml diff --git a/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml b/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml new file mode 100644 index 0000000000..fd3547c3be --- /dev/null +++ b/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml @@ -0,0 +1,32 @@ + + + + one.mixin.messenger.desktop + Mixin Messenger + Mixin Messenger + Mixin Team + https://mixin.one/mm + GPL-3.0 + GPL-3.0 + + pointing + keyboard + touch + + +

Mixin Messenger is an open-source signal protocol messenger.

+ + one.mixin.messenger.desktop + + + https://mixin.one/assets/cd25391eaca31876c588.webp + + + + + + + \ No newline at end of file From 0e2320bdf0b7eca4b21aa4e6d4fb02faf73ca946 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:13:36 +0800 Subject: [PATCH 06/32] fix metainfo --- dist/flatpak/one.mixin.messenger.desktop.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 4fe47bea08..5e19191bdd 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -28,7 +28,7 @@ "mkdir -p /app/bin", "ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop", "mkdir -p /app/share/metainfo", - "cp -r one.mixin.messenger.metainfo.xml /app/share/metainfo/", + "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/metainfo/", "mkdir -p /app/share/icons/hicolor/scalable/apps", "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/one.mixin.messenger.desktop.svg", "mkdir -p /app/share/applications", @@ -48,6 +48,10 @@ { "type": "file", "path": "mixin-desktop-linux-portable.tar.gz" + }, + { + "type": "file", + "path": "one.mixin.messenger.desktop.metainfo.xml" } ] } From 907fa1cbae6702fb2b5652780ceaa43cf4e28321 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:21:10 +0800 Subject: [PATCH 07/32] fix --- dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 5e19191bdd..b180258d80 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -34,7 +34,7 @@ "mkdir -p /app/share/applications", "cp -r one.mixin.messenger.desktop /app/share/applications/", "mkdir -p /app/share/appdata", - "cp -r one.mixin.messenger.metainfo.xml /app/share/appdata/" + "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/appdata/" ], "sources": [ { From 5925f09b33088ed76e6f4fcdcb4eb77fe464be21 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:33:46 +0800 Subject: [PATCH 08/32] icon --- dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index b180258d80..1683523c86 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -30,7 +30,7 @@ "mkdir -p /app/share/metainfo", "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/metainfo/", "mkdir -p /app/share/icons/hicolor/scalable/apps", - "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/one.mixin.messenger.desktop.svg", + "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/mixin_desktop.svg", "mkdir -p /app/share/applications", "cp -r one.mixin.messenger.desktop /app/share/applications/", "mkdir -p /app/share/appdata", From 000e1dd3ac1d3118b66e618ce7f514201b8fb36e Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:35:56 +0800 Subject: [PATCH 09/32] remove unused --- dist/flatpak/one.mixin.messenger.desktop.yaml | 19 ------------------- dist/linux_flatpak.sh | 12 ------------ 2 files changed, 31 deletions(-) delete mode 100644 dist/flatpak/one.mixin.messenger.desktop.yaml delete mode 100755 dist/linux_flatpak.sh diff --git a/dist/flatpak/one.mixin.messenger.desktop.yaml b/dist/flatpak/one.mixin.messenger.desktop.yaml deleted file mode 100644 index 0283826932..0000000000 --- a/dist/flatpak/one.mixin.messenger.desktop.yaml +++ /dev/null @@ -1,19 +0,0 @@ -app-id: org.flatpak.Hello -runtime: org.freedesktop.Platform -runtime-version: '21.08' -sdk: org.freedesktop.Sdk -command: mixin_desktop -modules: - - name: hello - buildsystem: simple - build-commands: - - mkdir -p /app/mixin_desktop - - tar -xf mixin-linux-portable.tar.gz -C /app/mixin_desktop - - chmod +x /app/mixin_desktop/mixin_desktop - - mkdir -p /app/bin - - ln -s /app/mixin_desktop/mixin_desktop /app/bin/mixin_desktop - sources: - - type: file - path: icon.svg - - type: file - path: mixin-linux-portable.tar.gz \ No newline at end of file diff --git a/dist/linux_flatpak.sh b/dist/linux_flatpak.sh deleted file mode 100755 index 826fe100f7..0000000000 --- a/dist/linux_flatpak.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -current_dir=$(dirname "$0") -project_dir="${current_dir}/.." - - -rm "$project_dir/dist/flatpak/mixin-linux-portable.tar.gz" -tar -C "${project_dir}/build/linux/x64/release/bundle" -cvf mixin-linux-portable.tar.gz . - -pushd "$project_dir/dist/flatpak" || exit -flatpak-builder --force-clean build-dir one.mixin.messenger.desktop.yaml -popd || exit \ No newline at end of file From c5a0e93ea2c53d08c196b08c90d524b47bc6bd5d Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:49:24 +0800 Subject: [PATCH 10/32] update --- .github/workflows/manual-build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 2c2c8c1282..d163c9aa6f 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -102,15 +102,9 @@ jobs: - name: Build .flatpak uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: - bundle: FlutterApp.flatpak + bundle: mixin-desktop-linux.flatpak manifest-path: dist/flatpak/one.mixin.messenger.desktop.json - - name: Upload .flatpak artifact to workflow - uses: actions/upload-artifact@v2 - with: - name: Flatpak artifact - path: FlutterApp.flatpak - build-windows: runs-on: windows-latest if: false From d4ab153bb77d3f66d11fef9810f144d7e6f697fd Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 12:02:27 +0800 Subject: [PATCH 11/32] access home --- dist/flatpak/one.mixin.messenger.desktop.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 1683523c86..5be71ed641 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -11,7 +11,8 @@ "--socket=wayland", "--device=dri", "--socket=pulseaudio", - "--share=network" + "--share=network", + "--filesystem=home" ], "modules": [ { From 8bc0ce939f81f454f230f93e9a22206f0affe0a2 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 12:16:11 +0800 Subject: [PATCH 12/32] use gnome runtime --- .github/workflows/manual-build.yml | 2 +- dist/flatpak/one.mixin.messenger.desktop.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index d163c9aa6f..93fafe426e 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -87,7 +87,7 @@ jobs: needs: build-linux runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08 + image: bilelmoussaoui/flatpak-github-actions:gnome-42 options: --privileged steps: - name: Checkout code diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 5be71ed641..714a71cc2d 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -1,8 +1,8 @@ { "app-id": "one.mixin.messenger.desktop", - "runtime": "org.freedesktop.Platform", + "runtime": "org.gnome.Platform", "runtime-version": "21.08", - "sdk": "org.freedesktop.Sdk", + "sdk": "org.gnome.Sdk", "command": "mixin_desktop", "separate-locales": false, "finish-args": [ From 7531115b35f9dda88f69901985ff00ec3a60bdb0 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 12:31:40 +0800 Subject: [PATCH 13/32] fix gnome version --- dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 714a71cc2d..48a1aac45a 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -1,7 +1,7 @@ { "app-id": "one.mixin.messenger.desktop", "runtime": "org.gnome.Platform", - "runtime-version": "21.08", + "runtime-version": "42", "sdk": "org.gnome.Sdk", "command": "mixin_desktop", "separate-locales": false, From d0db7aa1edc0bde7b3c53bd7aaca056d0c8fa894 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 13:11:00 +0800 Subject: [PATCH 14/32] add ffmpeg extension --- dist/flatpak/one.mixin.messenger.desktop.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 48a1aac45a..8c2e8c81aa 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -14,6 +14,12 @@ "--share=network", "--filesystem=home" ], + "add-extensions": { + "org.freedesktop.Platform.ffmpeg-full": { + "directory": "lib/ffmpeg", + "version": "21.08" + } + }, "modules": [ { "name": "mixin_desktop", From 499f21649af88a16026086ec86c45368b50c68fe Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 13:47:16 +0800 Subject: [PATCH 15/32] cache key --- .github/workflows/manual-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 93fafe426e..2d67d01b9e 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -103,6 +103,7 @@ jobs: uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: bundle: mixin-desktop-linux.flatpak + cache-key: flatpak-builder-${{ github.sha }} manifest-path: dist/flatpak/one.mixin.messenger.desktop.json build-windows: From fd4e482f3c25b7991ad25fe85b035a45fefd4173 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:04:02 +0800 Subject: [PATCH 16/32] extension --- dist/flatpak/one.mixin.messenger.desktop.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 8c2e8c81aa..1c1e3e766c 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -14,12 +14,9 @@ "--share=network", "--filesystem=home" ], - "add-extensions": { - "org.freedesktop.Platform.ffmpeg-full": { - "directory": "lib/ffmpeg", - "version": "21.08" - } - }, + "sdk-extensions": [ + "org.freedesktop.Platform.ffmpeg-full" + ], "modules": [ { "name": "mixin_desktop", From 9a319a47545ffc6b4b2a30cc80964636a85b1006 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:06:06 +0800 Subject: [PATCH 17/32] icon --- dist/flatpak/icon.svg | 16 ---------------- dist/flatpak/mixin_desktop.png | Bin 0 -> 26646 bytes dist/flatpak/one.mixin.messenger.desktop.json | 4 ++-- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 dist/flatpak/icon.svg create mode 100644 dist/flatpak/mixin_desktop.png diff --git a/dist/flatpak/icon.svg b/dist/flatpak/icon.svg deleted file mode 100644 index 9f8c2888b6..0000000000 --- a/dist/flatpak/icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - 1024*1024备份 3 - - - - - - - - - - - - - \ No newline at end of file diff --git a/dist/flatpak/mixin_desktop.png b/dist/flatpak/mixin_desktop.png new file mode 100644 index 0000000000000000000000000000000000000000..09a4eabd2b7a2ed7dc1bc67b650ccfacc8a7aaeb GIT binary patch literal 26646 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 z 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 i@BbeiI}- Date: Thu, 10 Nov 2022 14:23:14 +0800 Subject: [PATCH 18/32] env --- dist/flatpak/one.mixin.messenger.desktop.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index f6e0acae4e..176f3a1381 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -12,11 +12,15 @@ "--device=dri", "--socket=pulseaudio", "--share=network", - "--filesystem=home" - ], - "sdk-extensions": [ - "org.freedesktop.Platform.ffmpeg-full" + "--filesystem=home", + "--env=PATH=/usr/bin:/app/bin" ], + "add-extensions": { + "org.freedesktop.Platform.ffmpeg-full": { + "directory": "lib/ffmpeg", + "version": "21.08" + } + }, "modules": [ { "name": "mixin_desktop", From d42c35d1e0ece6ba0455c14fa1f13419ce0d895d Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:26:32 +0800 Subject: [PATCH 19/32] ld path --- dist/flatpak/one.mixin.messenger.desktop.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 176f3a1381..b684942933 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -18,7 +18,10 @@ "add-extensions": { "org.freedesktop.Platform.ffmpeg-full": { "directory": "lib/ffmpeg", - "version": "21.08" + "version": "21.08", + "add-ld-path": ".", + "autodownload": true, + "autodelete": false } }, "modules": [ From 6e91ad790a6727fe29f09c745134059f18566a70 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:33:12 +0800 Subject: [PATCH 20/32] fix icon path --- dist/flatpak/one.mixin.messenger.desktop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index b684942933..9a40db33c4 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -40,7 +40,7 @@ "ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop", "mkdir -p /app/share/metainfo", "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/metainfo/", - "mkdir -p /app/share/icons/hicolor/scalable/apps", + "mkdir -p /app/share/icons/hicolor/256x256/apps", "cp -r mixin_desktop.png /app/share/icons/hicolor/256x256/apps/mixin_desktop.png", "mkdir -p /app/share/applications", "cp -r one.mixin.messenger.desktop /app/share/applications/", From 2e2dd7bb395317be9f844cde691fbdfd8d5b1e05 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 16:33:27 +0800 Subject: [PATCH 21/32] update --- .gitignore | 5 ++- dist/flatpak/deb-buildapi/Makefile | 20 ++++++++++ dist/flatpak/deb-buildapi/configure | 7 ++++ dist/flatpak/icon.svg | 16 ++++++++ ...essenger.desktop => mixin_desktop.desktop} | 2 +- dist/flatpak/one.mixin.messenger.desktop.json | 40 ++++++++++++------- .../one.mixin.messenger.desktop.metainfo.xml | 2 +- 7 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 dist/flatpak/deb-buildapi/Makefile create mode 100755 dist/flatpak/deb-buildapi/configure create mode 100644 dist/flatpak/icon.svg rename dist/flatpak/{one.mixin.messenger.desktop => mixin_desktop.desktop} (87%) diff --git a/.gitignore b/.gitignore index 27aabaf3c6..655d772bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,7 @@ gradlew gradlew.bat local.properties -dist/snap/mixin_desktop \ No newline at end of file +dist/snap/mixin_desktop +dist/flatpak/build-dir* +dist/flatpak/.flatpak-builder +dist/flatpak/mixin-desktop-linux-portable.tar.gz \ No newline at end of file diff --git a/dist/flatpak/deb-buildapi/Makefile b/dist/flatpak/deb-buildapi/Makefile new file mode 100644 index 0000000000..6893c1b73c --- /dev/null +++ b/dist/flatpak/deb-buildapi/Makefile @@ -0,0 +1,20 @@ +all: + if ! [ -d /var/lib/dpkg ]; then \ + cp -PRp /usr/var /; \ + fi + set -e; \ + if test -d src; then \ + cd src && \ + dpkg-buildpackage -b -nc -d \ + --build-profiles=pkg.flatpak.app,nocheck,nodoc; \ + fi; \ + done + +# This assumes we don't need to run maintainer scripts. +install: + set -e; \ + for deb in *.deb; do \ + dpkg-deb --fsys-tarfile "$$deb" | \ + tar -xf- -C /app \ + --transform='s,^(\.?/)?(app|usr)/,,x'; \ + done diff --git a/dist/flatpak/deb-buildapi/configure b/dist/flatpak/deb-buildapi/configure new file mode 100755 index 0000000000..49799fa020 --- /dev/null +++ b/dist/flatpak/deb-buildapi/configure @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! -e Makefile ]; then + cp "$(dirname "$0")/Makefile" Makefile +fi + +exit 0 diff --git a/dist/flatpak/icon.svg b/dist/flatpak/icon.svg new file mode 100644 index 0000000000..9f8c2888b6 --- /dev/null +++ b/dist/flatpak/icon.svg @@ -0,0 +1,16 @@ + + + 1024*1024备份 3 + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/flatpak/one.mixin.messenger.desktop b/dist/flatpak/mixin_desktop.desktop similarity index 87% rename from dist/flatpak/one.mixin.messenger.desktop rename to dist/flatpak/mixin_desktop.desktop index 61acb6a1a9..48a3cdba66 100644 --- a/dist/flatpak/one.mixin.messenger.desktop +++ b/dist/flatpak/mixin_desktop.desktop @@ -7,4 +7,4 @@ Categories=InstantMessaging Version=1.0 Exec=mixin_desktop Terminal=false -Icon=mixin_desktop +Icon=one.mixin.messenger.desktop diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 9a40db33c4..86c4572d3a 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -13,17 +13,11 @@ "--socket=pulseaudio", "--share=network", "--filesystem=home", - "--env=PATH=/usr/bin:/app/bin" + "--talk-name=org.freedesktop.Notifications", + "--device=all", + "--env=PATH=/app/bin:/usr/bin", + "--env=LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/lib" ], - "add-extensions": { - "org.freedesktop.Platform.ffmpeg-full": { - "directory": "lib/ffmpeg", - "version": "21.08", - "add-ld-path": ".", - "autodownload": true, - "autodelete": false - } - }, "modules": [ { "name": "mixin_desktop", @@ -40,22 +34,26 @@ "ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop", "mkdir -p /app/share/metainfo", "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/metainfo/", - "mkdir -p /app/share/icons/hicolor/256x256/apps", - "cp -r mixin_desktop.png /app/share/icons/hicolor/256x256/apps/mixin_desktop.png", + "mkdir -p /app/share/icons/hicolor/scalable/apps", + "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/one.mixin.messenger.desktop.svg", "mkdir -p /app/share/applications", - "cp -r one.mixin.messenger.desktop /app/share/applications/", + "cp -r mixin_desktop.desktop /app/share/applications/one.mixin.messenger.desktop", "mkdir -p /app/share/appdata", "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/appdata/" ], "sources": [ { "type": "file", - "path": "one.mixin.messenger.desktop" + "path": "mixin_desktop.desktop" }, { "type": "file", "path": "mixin_desktop.png" }, + { + "type": "file", + "path": "icon.svg" + }, { "type": "file", "path": "mixin-desktop-linux-portable.tar.gz" @@ -65,6 +63,20 @@ "path": "one.mixin.messenger.desktop.metainfo.xml" } ] + }, + { + "name": "ogg", + "config-opts": [ + "--disable-static", + "--disable-examples" + ], + "sources": [ + { + "type": "archive", + "url": "https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.gz", + "sha256": "0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664" + } + ] } ] } \ No newline at end of file diff --git a/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml b/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml index fd3547c3be..140d2979ee 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml +++ b/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml @@ -19,7 +19,7 @@

Mixin Messenger is an open-source signal protocol messenger.

 - one.mixin.messenger.desktop + one.mixin.messenger.desktop.desktop https://mixin.one/assets/cd25391eaca31876c588.webp From 74d1ab2c119eeb32ce0322c198975e62a10be2ff Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:46:24 +0800 Subject: [PATCH 22/32] update --- dist/flatpak/deb-buildapi/Makefile | 20 ---------------- dist/flatpak/deb-buildapi/configure | 7 ------ dist/flatpak/one.mixin.messenger.desktop.json | 24 ++++++++++++++++++- pubspec.yaml | 6 ++++- 4 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 dist/flatpak/deb-buildapi/Makefile delete mode 100755 dist/flatpak/deb-buildapi/configure diff --git a/dist/flatpak/deb-buildapi/Makefile b/dist/flatpak/deb-buildapi/Makefile deleted file mode 100644 index 6893c1b73c..0000000000 --- a/dist/flatpak/deb-buildapi/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -all: - if ! [ -d /var/lib/dpkg ]; then \ - cp -PRp /usr/var /; \ - fi - set -e; \ - if test -d src; then \ - cd src && \ - dpkg-buildpackage -b -nc -d \ - --build-profiles=pkg.flatpak.app,nocheck,nodoc; \ - fi; \ - done - -# This assumes we don't need to run maintainer scripts. -install: - set -e; \ - for deb in *.deb; do \ - dpkg-deb --fsys-tarfile "$$deb" | \ - tar -xf- -C /app \ - --transform='s,^(\.?/)?(app|usr)/,,x'; \ - done diff --git a/dist/flatpak/deb-buildapi/configure b/dist/flatpak/deb-buildapi/configure deleted file mode 100755 index 49799fa020..0000000000 --- a/dist/flatpak/deb-buildapi/configure +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ! -e Makefile ]; then - cp "$(dirname "$0")/Makefile" Makefile -fi - -exit 0 diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 86c4572d3a..966c950bf3 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -16,7 +16,7 @@ "--talk-name=org.freedesktop.Notifications", "--device=all", "--env=PATH=/app/bin:/usr/bin", - "--env=LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/lib" + "--env=LD_LIBRARY_PATH=." ], "modules": [ { @@ -76,6 +76,28 @@ "url": "https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.gz", "sha256": "0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664" } + ], + "post-install": [ + "cp /app/lib/libogg.so.0.8.5 /app/FlutterApp/lib/libogg.so.0", + "ln -s /app/FlutterApp/lib/libogg.so.0 /app/FlutterApp/lib/libogg.so" + ] + }, + { + "name": "opus", + "config-opts": [ + "--disable-static", + "--disable-doc", + "--disable-extra-programs" + ], + "sources": [ + { + "type": "archive", + "url": "https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz", + "sha256": "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" + } + ], + "post-install": [ + "cp /app/lib/libopus.so.0.8.0 /app/FlutterApp/lib/libopus.so.0" ] } ] diff --git a/pubspec.yaml b/pubspec.yaml index 33f5782273..5699b371ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -69,7 +69,11 @@ dependencies: mime: ^1.0.2 mixin_bot_sdk_dart: ^0.3.7 octo_image: ^1.0.2 - ogg_opus_player: ^0.5.0 + ogg_opus_player: + git: + url: https://github.com/MixinNetwork/flutter-plugins.git + ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 + path: packages/ogg_opus_player open_file: git: url: https://github.com/crazecoder/open_file.git From 5fa0e9f8fd55944f817e1be872326c57b455d667 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:55:21 +0800 Subject: [PATCH 23/32] add libogg to ci --- .github/workflows/manual-build.yml | 2 +- pubspec.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 2d67d01b9e..3af308fce7 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -29,7 +29,7 @@ jobs: sudo apt-get install -y ninja-build libgtk-3-dev sudo apt-get install libsdl2-dev sudo apt-get install webkit2gtk-4.0 - sudo apt-get install libopus-dev + sudo apt-get install libopus-dev, libogg-dev flutter doctor - run: flutter config --enable-linux-desktop diff --git a/pubspec.lock b/pubspec.lock index e013c0c063..f261307c92 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1025,10 +1025,11 @@ packages: ogg_opus_player: dependency: "direct main" description: - name: ogg_opus_player - sha256: a3d5cde18fdc376fd322a57404cd8c8446f75f61acaf659058119a4b091c3592 - url: "https://pub.dev" - source: hosted + path: "packages/ogg_opus_player" + ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 + resolved-ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 + url: "https://github.com/MixinNetwork/flutter-plugins.git" + source: git version: "0.5.0" open_file: dependency: "direct main" From feddc71c23816679616e4866b7a5a4e24fb2d6aa Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:59:14 +0800 Subject: [PATCH 24/32] add libogg to ci --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 3af308fce7..91dc45bf50 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -29,7 +29,7 @@ jobs: sudo apt-get install -y ninja-build libgtk-3-dev sudo apt-get install libsdl2-dev sudo apt-get install webkit2gtk-4.0 - sudo apt-get install libopus-dev, libogg-dev + sudo apt-get install libopus-dev libogg-dev flutter doctor - run: flutter config --enable-linux-desktop From c04f82b25d1523e59973da23c08561fa699d0427 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:04:16 +0800 Subject: [PATCH 25/32] remove ogg,opus lib --- dist/flatpak/one.mixin.messenger.desktop.json | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json index 966c950bf3..77c86466a7 100644 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ b/dist/flatpak/one.mixin.messenger.desktop.json @@ -63,42 +63,6 @@ "path": "one.mixin.messenger.desktop.metainfo.xml" } ] - }, - { - "name": "ogg", - "config-opts": [ - "--disable-static", - "--disable-examples" - ], - "sources": [ - { - "type": "archive", - "url": "https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.gz", - "sha256": "0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664" - } - ], - "post-install": [ - "cp /app/lib/libogg.so.0.8.5 /app/FlutterApp/lib/libogg.so.0", - "ln -s /app/FlutterApp/lib/libogg.so.0 /app/FlutterApp/lib/libogg.so" - ] - }, - { - "name": "opus", - "config-opts": [ - "--disable-static", - "--disable-doc", - "--disable-extra-programs" - ], - "sources": [ - { - "type": "archive", - "url": "https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz", - "sha256": "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" - } - ], - "post-install": [ - "cp /app/lib/libopus.so.0.8.0 /app/FlutterApp/lib/libopus.so.0" - ] } ] } \ No newline at end of file From c181001626c8c6d51a3f2777687307a3b904361e Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:18:24 +0800 Subject: [PATCH 26/32] migrate to yml --- .github/workflows/manual-build.yml | 2 +- dist/flatpak/icon.svg | 16 ----- dist/flatpak/mixin_desktop.desktop | 2 +- ...etainfo.xml => mixin_desktop.metainfo.xml} | 0 dist/flatpak/one.mixin.messenger.desktop.json | 68 ------------------- dist/flatpak/one.mixin.messenger.desktop.yml | 50 ++++++++++++++ 6 files changed, 52 insertions(+), 86 deletions(-) delete mode 100644 dist/flatpak/icon.svg rename dist/flatpak/{one.mixin.messenger.desktop.metainfo.xml => mixin_desktop.metainfo.xml} (100%) delete mode 100644 dist/flatpak/one.mixin.messenger.desktop.json create mode 100644 dist/flatpak/one.mixin.messenger.desktop.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 91dc45bf50..c40bb25978 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -104,7 +104,7 @@ jobs: with: bundle: mixin-desktop-linux.flatpak cache-key: flatpak-builder-${{ github.sha }} - manifest-path: dist/flatpak/one.mixin.messenger.desktop.json + manifest-path: dist/flatpak/one.mixin.messenger.desktop.yml build-windows: runs-on: windows-latest diff --git a/dist/flatpak/icon.svg b/dist/flatpak/icon.svg deleted file mode 100644 index 9f8c2888b6..0000000000 --- a/dist/flatpak/icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - 1024*1024备份 3 - - - - - - - - - - - - - \ No newline at end of file diff --git a/dist/flatpak/mixin_desktop.desktop b/dist/flatpak/mixin_desktop.desktop index 48a3cdba66..61acb6a1a9 100644 --- a/dist/flatpak/mixin_desktop.desktop +++ b/dist/flatpak/mixin_desktop.desktop @@ -7,4 +7,4 @@ Categories=InstantMessaging Version=1.0 Exec=mixin_desktop Terminal=false -Icon=one.mixin.messenger.desktop +Icon=mixin_desktop diff --git a/dist/flatpak/one.mixin.messenger.desktop.metainfo.xml b/dist/flatpak/mixin_desktop.metainfo.xml similarity index 100% rename from dist/flatpak/one.mixin.messenger.desktop.metainfo.xml rename to dist/flatpak/mixin_desktop.metainfo.xml diff --git a/dist/flatpak/one.mixin.messenger.desktop.json b/dist/flatpak/one.mixin.messenger.desktop.json deleted file mode 100644 index 77c86466a7..0000000000 --- a/dist/flatpak/one.mixin.messenger.desktop.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "app-id": "one.mixin.messenger.desktop", - "runtime": "org.gnome.Platform", - "runtime-version": "42", - "sdk": "org.gnome.Sdk", - "command": "mixin_desktop", - "separate-locales": false, - "finish-args": [ - "--share=ipc", - "--socket=fallback-x11", - "--socket=wayland", - "--device=dri", - "--socket=pulseaudio", - "--share=network", - "--filesystem=home", - "--talk-name=org.freedesktop.Notifications", - "--device=all", - "--env=PATH=/app/bin:/usr/bin", - "--env=LD_LIBRARY_PATH=." - ], - "modules": [ - { - "name": "mixin_desktop", - "buildsystem": "simple", - "only-arches": [ - "x86_64" - ], - "build-commands": [ - "mkdir -p FlutterApp", - "tar -xf mixin-desktop-linux-portable.tar.gz -C FlutterApp", - "cp -r FlutterApp /app/", - "chmod +x /app/FlutterApp/mixin_desktop", - "mkdir -p /app/bin", - "ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop", - "mkdir -p /app/share/metainfo", - "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/metainfo/", - "mkdir -p /app/share/icons/hicolor/scalable/apps", - "cp -r icon.svg /app/share/icons/hicolor/scalable/apps/one.mixin.messenger.desktop.svg", - "mkdir -p /app/share/applications", - "cp -r mixin_desktop.desktop /app/share/applications/one.mixin.messenger.desktop", - "mkdir -p /app/share/appdata", - "cp -r one.mixin.messenger.desktop.metainfo.xml /app/share/appdata/" - ], - "sources": [ - { - "type": "file", - "path": "mixin_desktop.desktop" - }, - { - "type": "file", - "path": "mixin_desktop.png" - }, - { - "type": "file", - "path": "icon.svg" - }, - { - "type": "file", - "path": "mixin-desktop-linux-portable.tar.gz" - }, - { - "type": "file", - "path": "one.mixin.messenger.desktop.metainfo.xml" - } - ] - } - ] - } \ No newline at end of file diff --git a/dist/flatpak/one.mixin.messenger.desktop.yml b/dist/flatpak/one.mixin.messenger.desktop.yml new file mode 100644 index 0000000000..557d76926b --- /dev/null +++ b/dist/flatpak/one.mixin.messenger.desktop.yml @@ -0,0 +1,50 @@ +id: one.mixin.messenger.desktop +runtime: org.gnome.Platform +runtime-version: '42' +sdk: org.gnome.Sdk +command: mixin_desktop +rename-desktop-file: mixin_desktop.desktop +rename-icon: mixin_desktop +rename-appdata-file: mixin_desktop.metainfo.xml +finish-args: + - --share=ipc + - --socket=fallback-x11 + - --socket=wayland + - --device=dri + - --socket=pulseaudio + - --share=network + - --filesystem=home + - --talk-name=org.freedesktop.Notifications + - --talk-name=org.kde.StatusNotifierWatcher + - --device=all + - --env=PATH=/app/bin:/usr/bin + +modules: + - name: mixin_desktop + buildsystem: simple + only-arches: + - x86_64 + build-commands: + - mkdir -p FlutterApp + - tar -xf mixin-desktop-linux-portable.tar.gz -C FlutterApp + - cp -r FlutterApp /app/ + - chmod +x /app/FlutterApp/mixin_desktop + - mkdir -p /app/bin + - ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop + - mkdir -p /app/share/metainfo + - cp -r mixin_desktop.metainfo.xml /app/share/metainfo/ + - mkdir -p /app/share/icons/hicolor/256x256/apps + - cp -r mixin_desktop.png /app/share/icons/hicolor/256x256/apps/mixin_desktop.png + - mkdir -p /app/share/applications + - cp -r mixin_desktop.desktop /app/share/applications/mixin_desktop.desktop + - mkdir -p /app/share/appdata + - cp -r mixin_desktop.metainfo.xml /app/share/appdata/ + sources: + - type: file + path: mixin_desktop.desktop + - type: file + path: mixin_desktop.png + - type: file + path: mixin-desktop-linux-portable.tar.gz + - type: file + path: mixin_desktop.metainfo.xml \ No newline at end of file From 59a82547e8d9fbaadcebad4ac70c18271fcb3c6a Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:30:48 +0800 Subject: [PATCH 27/32] build --- .github/workflows/manual-build.yml | 106 +++++++++++++++++++---------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index c40bb25978..f158ad7611 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -48,40 +48,14 @@ jobs: name: mixin-desktop-linux-portable-archive path: mixin-desktop-linux-portable.tar.gz -# - name: Prepare snap build -# run: ./dist/linux_snap_prepare.sh -# -# - uses: snapcore/action-build@v1 -# id: build-snap -# with: -# snapcraft-args: '--enable-experimental-extensions' -# path: dist/snap -# -# - uses: actions/upload-artifact@v3 -# with: -# name: mixin-desktop-snap -# path: ${{ steps.build-snap.outputs.snap }} -# -# - name: Package APP -# run: ./dist/linux_deb.sh -# -# - name: Upload Artifact -# uses: actions/upload-artifact@v2 -# with: -# name: mixin_desktop_amd64.deb.zip -# path: build/mixin_desktop_amd64.deb -# -# - name: Build AppImage unsing appimage-builder -# uses: docker://appimagecrafters/appimage-builder:0.9.1 -# with: -# entrypoint: appimage-builder -# args: --recipe ./AppImageBuilder.yml --skip-test -# -# - name: Upload AppImage Artifact -# uses: actions/upload-artifact@v2 -# with: -# name: AppImage -# path: './*.AppImage*' + - name: Package APP + run: ./dist/linux_deb.sh + + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: mixin_desktop_amd64.deb.zip + path: build/mixin_desktop_amd64.deb build-linux-flatpak: needs: build-linux @@ -102,10 +76,72 @@ jobs: - name: Build .flatpak uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: - bundle: mixin-desktop-linux.flatpak + bundle: mixin-desktop-flatpak.flatpak cache-key: flatpak-builder-${{ github.sha }} manifest-path: dist/flatpak/one.mixin.messenger.desktop.yml + build-linux-snap: + needs: build-linux + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Download app archive + uses: actions/download-artifact@v3 + with: + name: mixin-desktop-linux-portable-archive + + - name: uncompress app archive + run: | + mkdir -p build/linux/x64/release/bundle + tar -C build/linux/x64/release/bundle -xvf mixin-desktop-linux-portable.tar.gz + + - name: Prepare snap build + run: ./dist/linux_snap_prepare.sh + + - name: Build .snap + uses: snapcore/action-build@v1 + id: build-snap + with: + snapcraft-args: '--enable-experimental-extensions' + path: dist/snap + + - name: Upload snap + uses: actions/upload-artifact@v3 + with: + name: mixin-desktop-snap + path: ${{ steps.build-snap.outputs.snap }} + + build-linux-appimage: + needs: build-linux + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Download app archive + uses: actions/download-artifact@v3 + with: + name: mixin-desktop-linux-portable-archive + + - name: uncompress app archive + run: | + mkdir -p build/linux/x64/release/bundle + tar -C build/linux/x64/release/bundle -xvf mixin-desktop-linux-portable.tar.gz + + - name: Build AppImage unsing appimage-builder + uses: docker://appimagecrafters/appimage-builder:0.9.1 + with: + entrypoint: appimage-builder + args: --recipe ./AppImageBuilder.yml --skip-test + + - name: Upload AppImage Artifact + uses: actions/upload-artifact@v2 + with: + name: AppImage + path: './*.AppImage*' + build-windows: runs-on: windows-latest if: false From 9a3c5e3b3d064d93d727a27045d558d98f63d7f0 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:35:00 +0800 Subject: [PATCH 28/32] no skip windows --- .github/workflows/manual-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index f158ad7611..45a7a5cd8d 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -144,7 +144,6 @@ jobs: build-windows: runs-on: windows-latest - if: false steps: - uses: actions/checkout@v3 From d0960b72b407873a7c0b6879616730e9d160c85b Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:36:12 +0800 Subject: [PATCH 29/32] manual trigger only --- .github/workflows/manual-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 45a7a5cd8d..03726a24c9 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -9,7 +9,6 @@ on: description: "run with flutter channel, eg: master, beta, stable" required: true default: "master" - push: jobs: build-linux: @@ -18,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - channel: master # 'master', 'beta', 'dev' or 'stable' + channel: '${{ github.event.inputs.flutter_channel }}' # 'master', 'beta', 'dev' or 'stable' # flutter build need ninja. # https://github.com/subosito/flutter-action/issues/49 From 6299056c75adfc0cedbe4221a15802e9d24696d3 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:44:10 +0800 Subject: [PATCH 30/32] bump ogg_opus_player version --- pubspec.lock | 11 +++++------ pubspec.yaml | 6 +----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f261307c92..b088748f40 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1025,12 +1025,11 @@ packages: ogg_opus_player: dependency: "direct main" description: - path: "packages/ogg_opus_player" - ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 - resolved-ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 - url: "https://github.com/MixinNetwork/flutter-plugins.git" - source: git - version: "0.5.0" + name: ogg_opus_player + sha256: "9d3f813d3ed39dc9bd58e599ed835ce9c06018d48c58237ee5c5ed85411aa8fb" + url: "https://pub.dev" + source: hosted + version: "0.5.1" open_file: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 5699b371ae..59f44195b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -69,11 +69,7 @@ dependencies: mime: ^1.0.2 mixin_bot_sdk_dart: ^0.3.7 octo_image: ^1.0.2 - ogg_opus_player: - git: - url: https://github.com/MixinNetwork/flutter-plugins.git - ref: ab8fc94723a3440b9e4594a25654f9bd0be01a79 - path: packages/ogg_opus_player + ogg_opus_player: ^0.5.1 open_file: git: url: https://github.com/crazecoder/open_file.git From 3f993de06437d3e83dd487948907d2ac4b980451 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:52:46 +0800 Subject: [PATCH 31/32] ignore warning --- lib/ui/home/bloc/message_bloc.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ui/home/bloc/message_bloc.dart b/lib/ui/home/bloc/message_bloc.dart index e3fa880172..ba8d3bb83a 100644 --- a/lib/ui/home/bloc/message_bloc.dart +++ b/lib/ui/home/bloc/message_bloc.dart @@ -176,6 +176,7 @@ class MessageState extends Equatable { ); } + // ignore: avoid_returning_this return this; } } From 7ed7e643cdef0140348b75850a10cf6ac7ac57f2 Mon Sep 17 00:00:00 2001 From: boyan01 <17426470+boyan01@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:03:02 +0800 Subject: [PATCH 32/32] add libogg deps --- .github/workflows/dart.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index c331c84a25..94a792d6fa 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -31,7 +31,7 @@ jobs: sudo apt-get install -y ninja-build libgtk-3-dev sudo apt-get install libsdl2-dev sudo apt-get install webkit2gtk-4.0 - sudo apt-get install libopus-dev + sudo apt-get install libopus-dev libogg-dev flutter doctor - name: Install dependencies diff --git a/README.md b/README.md index f815018723..b959f69e59 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ there are some addition library needed. sudo apt-get install libsqlite3-dev sudo apt-get install webkit2gtk-4.0 sudo apt-get install libsdl2-dev -sudo apt-get install libopus-dev +sudo apt-get install libopus-dev libogg-dev ```