diff --git a/com.gitbutler.gitbutler.metainfo.xml b/com.gitbutler.gitbutler.metainfo.xml index ee9da79..c8bacdc 100644 --- a/com.gitbutler.gitbutler.metainfo.xml +++ b/com.gitbutler.gitbutler.metainfo.xml @@ -41,6 +41,12 @@ + + + + + + diff --git a/com.gitbutler.gitbutler.yml b/com.gitbutler.gitbutler.yml index 9ce93b6..b880924 100644 --- a/com.gitbutler.gitbutler.yml +++ b/com.gitbutler.gitbutler.yml @@ -2,7 +2,7 @@ id: com.gitbutler.gitbutler runtime: org.gnome.Platform runtime-version: '47' sdk: org.gnome.Sdk -command: git-butler +command: gitbutler-tauri finish-args: - --share=ipc - --socket=fallback-x11 @@ -12,67 +12,27 @@ finish-args: - --filesystem=~/.ssh:ro - --filesystem=xdg-run/gvfsd modules: - - name: webkit2gtk-4.0 - sources: - - type: archive - url: https://webkitgtk.org/releases/webkitgtk-2.46.2.tar.xz - sha256: 5aae1c5c0a30d5e9c5831652b6f1bdefc31d75e0ad81cb40185b0aed92ce79b6 - x-checker-data: - type: html - url: https://webkitgtk.org/releases/ - version-pattern: LATEST-STABLE-(\d[\.\d]+\d) - url-template: https://webkitgtk.org/releases/webkitgtk-$version.tar.xz - buildsystem: cmake-ninja - config-opts: - - -DPORT=GTK - - -DENABLE_BUBBLEWRAP_SANDBOX=OFF - - -DCMAKE_BUILD_TYPE=Release - - -DENABLE_DOCUMENTATION=OFF - - -DENABLE_MINIBROWSER=OFF - - -DENABLE_WEBDRIVER=OFF - - -DENABLE_GAMEPAD=OFF - - -DUSE_SOUP2=ON - - -DUSE_GTK4=OFF - modules: - - shared-modules/libsoup/libsoup-2.4.json - - name: unifdef - no-autogen: true - make-install-args: - - prefix=${FLATPAK_DEST} - sources: - - type: archive - url: https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz - sha256: 43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400 - cleanup: - - '*' - - name: libbacktrace - sources: - - type: git - url: https://github.com/ianlancetaylor/libbacktrace.git - commit: 7ead8c1ea2f4aeafe9c5b9ef8a9461a9ba781aa8 - - shared-modules/libappindicator/libappindicator-gtk3-12.10.json - - name: git-butler buildsystem: simple build-commands: - - ar x git-butler.deb - - tar xf data.tar.gz - - install -Dm755 -t /app/bin usr/bin/git-butler + - ls + - install -Dm755 -t /app/bin bin/gitbutler-tauri + - install -Dm755 -t /app/bin bin/gitbutler-git-askpass + - install -Dm755 -t /app/bin bin/gitbutler-git-setsid - install -Dm644 -t /app/share/metainfo com.gitbutler.gitbutler.metainfo.xml - - install -Dm644 usr/share/applications/git-butler.desktop /app/share/applications/com.gitbutler.gitbutler.desktop + - install -Dm644 share/applications/GitButler.desktop /app/share/applications/com.gitbutler.gitbutler.desktop - | for size in 32x32 128x128 256x256@2; do - install -Dm644 usr/share/icons/hicolor/${size}/apps/git-butler.png /app/share/icons/hicolor/${size}/apps/com.gitbutler.gitbutler.png + install -Dm644 share/icons/hicolor/${size}/apps/gitbutler-tauri.png /app/share/icons/hicolor/${size}/apps/com.gitbutler.gitbutler.png done - desktop-file-edit --set-icon=com.gitbutler.gitbutler --add-category=RevisionControl --set-key=Comment --set-value='The GitButler version control client, backed by Git, powered by Tauri/Rust/Svelte' /app/share/applications/com.gitbutler.gitbutler.desktop sources: - - type: file - dest-filename: git-butler.deb - url: https://releases.gitbutler.com/releases/release/0.13.8-1417/linux/x86_64/git-butler_0.13.8_amd64.deb - sha256: 59b29ac5b8a13580622e28803d5c679b786c5d341a0b25d77fc74e5cfe23c1de + - type: archive + url: https://releases.gitbutler.com/releases/release/0.13.10-1443/linux/x86_64/GitButler-0.13.10-1.x86_64.rpm + sha256: af25e962e11b99b1c72912f929fd4ddeecf61a4665997db5d59412a04520a385 only-arches: - x86_64 x-checker-data: @@ -80,6 +40,6 @@ modules: url: https://app.gitbutler.com/releases version-query: .version timestamp-query: .pub_date - url-query: .platforms."linux-x86_64".url | sub(".AppImage.tar.gz"; ".deb") + url-query: .platforms."linux-x86_64".url | sub("GitButler_(?.*)_amd64.AppImage.tar.gz"; "GitButler-\(.version)-1.x86_64.rpm") - type: file path: com.gitbutler.gitbutler.metainfo.xml