awesome-bookmarks/Meshtastic-Android
3
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-06-02 06:24:16 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix(flatpak): source desktop metadata from in-repo packaging dir (#5673)

Browse Source 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
James Rich
2026-05-30 09:29:53 -07:00
committed by GitHub
parent 47b62b1300
commit 5c0fe4e845
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/verify-flatpak/desktop-offline.yaml
+10 -9
View File
@@ -65,9 +65,13 @@ modules:
# Point Gradle at the offline mirror produced by flatpak-sources.json # Point Gradle at the offline mirror produced by flatpak-sources.json
GRADLE_USER_HOME: /run/build/meshtastic-desktop/.gradle GRADLE_USER_HOME: /run/build/meshtastic-desktop/.gradle
build-commands: build-commands:
- install -Dm644 -t /app/share/icons/hicolor/scalable/apps org.meshtastic.desktop.svg # Install desktop metadata from the in-repo packaging sources (mirrors vid's upstream manifest,
- install -Dm644 -t /app/share/applications org.meshtastic.desktop.desktop # which stopped shipping standalone root-level copies as of 2026-05-30).
- install -Dm644 -t /app/share/metainfo org.meshtastic.desktop.metainfo.xml - install -Dm644 desktopApp/packaging/icons/icon.svg /app/share/icons/hicolor/scalable/apps/org.meshtastic.desktop.svg
- install -Dm644 -t /app/share/applications desktopApp/packaging/linux/org.meshtastic.desktop.desktop
- desktop-file-edit --set-key="Exec" --set-value="meshtastic-wrapper.sh %U"
/app/share/applications/org.meshtastic.desktop.desktop
- install -Dm644 -t /app/share/metainfo desktopApp/packaging/linux/org.meshtastic.desktop.metainfo.xml
# Redirect the Gradle wrapper to the bundled distribution (no network). # Redirect the Gradle wrapper to the bundled distribution (no network).
- sed -i 's|distributionUrl=.*|distributionUrl=gradle-all.zip|' gradle/wrapper/gradle-wrapper.properties - sed -i 's|distributionUrl=.*|distributionUrl=gradle-all.zip|' gradle/wrapper/gradle-wrapper.properties
- echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties - echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
@@ -83,12 +87,9 @@ modules:
JAR_FILE=$(find desktopApp/build/compose/jars/ -name "*.jar" -type f | head -1) JAR_FILE=$(find desktopApp/build/compose/jars/ -name "*.jar" -type f | head -1)
&& install -Dm755 "$JAR_FILE" /app/lib/meshtastic-desktop.jar && install -Dm755 "$JAR_FILE" /app/lib/meshtastic-desktop.jar
sources: sources:
- type: file # Desktop metadata (.desktop/.metainfo.xml/.svg) now lives inside the meshtastic-android
path: org.meshtastic.desktop.desktop # source tree (desktopApp/packaging/...) and is installed by build-commands above —
- type: file # no longer sourced as standalone root-level files.
path: org.meshtastic.desktop.metainfo.xml
- type: file
path: org.meshtastic.desktop.svg
- type: dir - type: dir
path: meshtastic-android path: meshtastic-android
- type: file - type: file