chore: remove submodule and clean up flatpak

This commit is contained in:
reya 2024-01-31 14:31:16 +07:00
parent 21989e6fa5
commit b806a34edb
10 changed files with 77 additions and 91 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "modules/depot"]
path = modules/depot
url = https://github.com/luminous-devs/depot.git

View File

@ -1,13 +0,0 @@
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 87c23e40..bb84872e 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -50,8 +50,6 @@
"deb": {
"depends": []
},
- "externalBin": ["bin/depot"],
- "resources": ["resources/*"],
"icon": [
"icons/32x32.png",
"icons/128x128.png",

View File

@ -35,15 +35,6 @@ RUN pnpm install --frozen-lockfile
# Path for disable updater # Path for disable updater
#ADD flatpak/0001-disable-tauri-updater.patch . #ADD flatpak/0001-disable-tauri-updater.patch .
#RUN patch -p1 -t -i flatpak/0001-disable-tauri-updater.patch #RUN patch -p1 -t -i flatpak/0001-disable-tauri-updater.patch
#ADD flatpak/0002-depot-remove.patch .
#RUN patch -p1 -t -i 0002-depot-remove.patch
# compile depot
#ADD flatpak/build-depot.sh build-depot.sh
#RUN mv flatpak/build-depot.sh build-depot.sh
#RUN sh build-depot.sh
#RUN pnpm run build:depot
#ENV VITE_FLATPAK_RESOURCE="/app/lib/lume/resources/config.toml" #ENV VITE_FLATPAK_RESOURCE="/app/lib/lume/resources/config.toml"

View File

@ -1,15 +0,0 @@
#!/usr/bin/env sh
directory_bin="/lume/src-tauri/bin"
target="x86_64-unknown-linux-gnu"
cd modules/depot
check_directory_keep=$(ls $directory_bin | grep -vE '.keep$' | wc -l)
echo $(ls $directory_bin | grep -vE '.keep$')
if [ $check_directory_keep -eq 0 ]; then
cargo build --release
mv target/release/depot "$directory_bin/depot-$target"
fi

View File

@ -1,50 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application"> <component type="desktop-application">
<id>nu.lume.Lume</id> <id>
<launchable type="desktop-id">nu.lume.Lume.desktop</launchable> nu.lume.Lume
</id>
<name>Lume</name> <launchable type="desktop-id">
<summary>A cross-platform desktop nostr client</summary> nu.lume.Lume.desktop
<developer_name>Ren Amamiya</developer_name> </launchable>
<name>
<metadata_license>CC0-1.0</metadata_license> Lume
<project_license>GPL-3.0-only</project_license> </name>
<summary>
<url type="homepage">https://lume.nu</url> A cross-platform desktop nostr client
<url type="bugtracker">https://github.com/luminous-devs/lume/issues</url> </summary>
<url type="donation">https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445</url> <developer_name>
Ren Amamiya
<supports> </developer_name>
<control>pointing</control> <metadata_license>
<control>keyboard</control> CC0-1.0
<control>touch</control> </metadata_license>
</supports> <project_license>
GPL-3.0-only
<description> </project_license>
<p> <url type="homepage">
Lume a cross-platform nostr client, supported nsbunker, chats and notifications https://lume.nu
</p> </url>
</description> <url type="bugtracker">
https://github.com/luminous-devs/lume/issues
<custom> </url>
<value key="Purism::form_factor">workstation</value> <url type="donation">
<value key="Purism::form_factor">mobile</value> https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445
</custom> </url>
<screenshots> <supports>
<screenshot type="default"> <control>
<image> https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/login-screen.png </image> pointing
</screenshot> </control>
<screenshot> <control>
<image>https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/collumns.png</image> keyboard
</screenshot> </control>
<screenshot> <control>
<image> https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/home-screen.png </image> touch
</screenshot> </control>
</screenshots> </supports>
<description>
<p>
<releases> Lume a cross-platform nostr client, supported nsecbunker, chats and notifications
<release version="2.2.3" date="2023-12-07"/> </p>
</releases> </description>
<content_rating type="oars-1.1"/> <custom>
<value key="Purism::form_factor">
workstation
</value>
<value key="Purism::form_factor">
mobile
</value>
</custom>
<screenshots>
<screenshot type="default">
<image>
https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/login-screen.png
</image>
</screenshot>
<screenshot>
<image>
https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/collumns.png
</image>
</screenshot>
<screenshot>
<image>
https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/home-screen.png
</image>
</screenshot>
</screenshots>
<releases>
<release version="3.0.0" date="2024-15-01" />
</releases>
<content_rating type="oars-1.1" />
</component> </component>

View File

@ -32,9 +32,8 @@ modules:
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- install -Dm755 bin/lume /app/bin/lume - install -Dm755 bin/lume /app/bin/lume
# - install -Dm755 bin/depot /app/bin/depot - mkdir -p /app/lib/lume/resources
# - mkdir -p /app/lib/lume/resources - cp -r lib/lume/resources /app/lib/lume/resources
# - cp -r lib/lume/resources /app/lib/lume/resources
- mkdir -p /app/share/icons/hicolor/ - mkdir -p /app/share/icons/hicolor/
- cp -r share/icons/hicolor/ /app/share/icons/ - cp -r share/icons/hicolor/ /app/share/icons/
- install -Dm644 nu.lume.Lume.appdata.xml /app/share/metainfo/nu.lume.Lume.appdata.xml - install -Dm644 nu.lume.Lume.appdata.xml /app/share/metainfo/nu.lume.Lume.appdata.xml

View File

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

View File

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 2.5 MiB

View File

Before

Width:  |  Height:  |  Size: 606 KiB

After

Width:  |  Height:  |  Size: 606 KiB

@ -1 +0,0 @@
Subproject commit 22f913f26ff365c6408b005b695200279586211f