diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6d4c40bb..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "modules/depot"] - path = modules/depot - url = https://github.com/luminous-devs/depot.git diff --git a/flatpak/0002-depot-remove.patch b/flatpak/0002-depot-remove.patch deleted file mode 100644 index 39439e0e..00000000 --- a/flatpak/0002-depot-remove.patch +++ /dev/null @@ -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", diff --git a/flatpak/Containerfile b/flatpak/Containerfile index ffb10b24..194b0780 100644 --- a/flatpak/Containerfile +++ b/flatpak/Containerfile @@ -35,15 +35,6 @@ RUN pnpm install --frozen-lockfile # Path for disable updater #ADD 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" diff --git a/flatpak/build-depot.sh b/flatpak/build-depot.sh deleted file mode 100644 index 76b82634..00000000 --- a/flatpak/build-depot.sh +++ /dev/null @@ -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 diff --git a/flatpak/nu.lume.Lume.appdata.xml b/flatpak/nu.lume.Lume.appdata.xml index d16a7686..2c74ac1e 100644 --- a/flatpak/nu.lume.Lume.appdata.xml +++ b/flatpak/nu.lume.Lume.appdata.xml @@ -1,50 +1,78 @@ - nu.lume.Lume - nu.lume.Lume.desktop - - Lume - A cross-platform desktop nostr client - Ren Amamiya - - CC0-1.0 - GPL-3.0-only - - https://lume.nu - https://github.com/luminous-devs/lume/issues - https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445 - - - pointing - keyboard - touch - - - -

- Lume a cross-platform nostr client, supported nsbunker, chats and notifications -

-
- - - workstation - mobile - - - - https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/login-screen.png - - - https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/collumns.png - - - https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/home-screen.png - - - - - - - - + + nu.lume.Lume + + + nu.lume.Lume.desktop + + + Lume + + + A cross-platform desktop nostr client + + + Ren Amamiya + + + CC0-1.0 + + + GPL-3.0-only + + + https://lume.nu + + + https://github.com/luminous-devs/lume/issues + + + https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445 + + + + pointing + + + keyboard + + + touch + + + +

+ Lume a cross-platform nostr client, supported nsecbunker, chats and notifications +

+
+ + + workstation + + + mobile + + + + + + https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/login-screen.png + + + + + https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/collumns.png + + + + + https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/home-screen.png + + + + + + +
diff --git a/flatpak/nu.lume.Lume.yml b/flatpak/nu.lume.Lume.yml index c2cbb65b..48f15a6f 100644 --- a/flatpak/nu.lume.Lume.yml +++ b/flatpak/nu.lume.Lume.yml @@ -32,9 +32,8 @@ modules: buildsystem: simple build-commands: - install -Dm755 bin/lume /app/bin/lume - # - install -Dm755 bin/depot /app/bin/depot - # - mkdir -p /app/lib/lume/resources - # - cp -r lib/lume/resources /app/lib/lume/resources + - mkdir -p /app/lib/lume/resources + - cp -r lib/lume/resources /app/lib/lume/resources - mkdir -p /app/share/icons/hicolor/ - cp -r share/icons/hicolor/ /app/share/icons/ - install -Dm644 nu.lume.Lume.appdata.xml /app/share/metainfo/nu.lume.Lume.appdata.xml diff --git a/flatpak/screenshoots/collumns.png b/flatpak/screenshots/collumns.png similarity index 100% rename from flatpak/screenshoots/collumns.png rename to flatpak/screenshots/collumns.png diff --git a/flatpak/screenshoots/home-screen.png b/flatpak/screenshots/home-screen.png similarity index 100% rename from flatpak/screenshoots/home-screen.png rename to flatpak/screenshots/home-screen.png diff --git a/flatpak/screenshoots/login-screen.png b/flatpak/screenshots/login-screen.png similarity index 100% rename from flatpak/screenshoots/login-screen.png rename to flatpak/screenshots/login-screen.png diff --git a/modules/depot b/modules/depot deleted file mode 160000 index 22f913f2..00000000 --- a/modules/depot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22f913f26ff365c6408b005b695200279586211f