From 84dd7c1243226fdee66d6553c47c35998f8999e5 Mon Sep 17 00:00:00 2001 From: pugaizai Date: Sun, 23 Feb 2025 13:20:44 +0800 Subject: [PATCH] update --- .../com.cherry_ai.cherrystudio.metainfo.xml | 5 ++++- .../com.cherry_ai.cherrystudio.yml | 8 ++++---- .../io.github.arvinlovegood.go-stock.yml | 5 ----- .../io.github.venera_app.venera.yml | 7 +++++-- .../update_engine_version.sh.patch | 17 +++++++++++++++++ .../io.github.wgh136.pixes.yml | 7 +++++-- .../update_engine_version.sh.patch | 17 +++++++++++++++++ 7 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 manifests/io.github.venera_app.venera/update_engine_version.sh.patch create mode 100644 manifests/io.github.wgh136.pixes/update_engine_version.sh.patch diff --git a/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.metainfo.xml b/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.metainfo.xml index ef2c8b0..5b6bdc6 100644 --- a/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.metainfo.xml +++ b/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.metainfo.xml @@ -53,9 +53,12 @@ - + + + + diff --git a/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.yml b/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.yml index 94d5ef5..ce77654 100644 --- a/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.yml +++ b/manifests/com.cherry_ai.cherrystudio/com.cherry_ai.cherrystudio.yml @@ -54,8 +54,8 @@ modules: sources: - type: file only-arches: [x86_64] - url: https://github.com/CherryHQ/cherry-studio/releases/download/v0.9.29/Cherry-Studio-0.9.29-x86_64.AppImage - sha256: 510fdc4145d59582fe87b317b314f4cce07c597b0a98aa734ce2833836fc4409 + url: https://github.com/CherryHQ/cherry-studio/releases/download/v0.9.30/Cherry-Studio-0.9.30-x86_64.AppImage + sha256: eb084ad66080752b3cd349eb6fd69d309c6a37b22edd93a0da3a29d6f979e509 dest-filename: Cherry-Studio.AppImage x-checker-data: type: json @@ -64,8 +64,8 @@ modules: url-query: .assets[] | select(.name | endswith("x86_64.AppImage")) | .browser_download_url - type: file only-arches: [aarch64] - url: https://github.com/CherryHQ/cherry-studio/releases/download/v0.9.29/Cherry-Studio-0.9.29-arm64.AppImage - sha256: a6c4fa7315a7ffc91692af99664f597ddb097078411d6f88910afc2a934cf719 + url: https://github.com/CherryHQ/cherry-studio/releases/download/v0.9.30/Cherry-Studio-0.9.30-arm64.AppImage + sha256: a2568f1c462eeaba5093e2b0ebc90191a1e64db9d4d48a26ac8417a0f422f00e dest-filename: Cherry-Studio.AppImage x-checker-data: type: json diff --git a/manifests/io.github.arvinlovegood.go-stock/io.github.arvinlovegood.go-stock.yml b/manifests/io.github.arvinlovegood.go-stock/io.github.arvinlovegood.go-stock.yml index 5a004ce..3a59230 100644 --- a/manifests/io.github.arvinlovegood.go-stock/io.github.arvinlovegood.go-stock.yml +++ b/manifests/io.github.arvinlovegood.go-stock/io.github.arvinlovegood.go-stock.yml @@ -32,11 +32,6 @@ modules: build-options: append-path: /usr/lib/sdk/node22/bin:/usr/lib/sdk/golang/bin build-commands: - - VERSION=$(grep -m1 -oP '(?<=## \[)\d+\.\d+\.\d+(?=\])' CHANGELOG.md) - # 使用扩展提供的工具链 - - /usr/lib/sdk/golang/bin/go build -ldflags="-X main.Version=$VERSION" -o ${FLATPAK_DEST}/bin/go-stock - - /usr/lib/sdk/node22/bin/npm install --prefix ${FLATPAK_DEST}/lib/node_modules - sources: - type: git url: https://github.com/arvinlovegood/go-stock diff --git a/manifests/io.github.venera_app.venera/io.github.venera_app.venera.yml b/manifests/io.github.venera_app.venera/io.github.venera_app.venera.yml index 2f1a99b..c6ba879 100644 --- a/manifests/io.github.venera_app.venera/io.github.venera_app.venera.yml +++ b/manifests/io.github.venera_app.venera/io.github.venera_app.venera.yml @@ -86,6 +86,9 @@ modules: path: io.github.venera_app.venera.metainfo.xml - type: git url: https://github.com/flutter/flutter.git - tag: 3.27.4 - commit: d8a9f9a52e5af486f80d932e838ee93861ffd863 + tag: 3.29.0 + commit: 35c388afb57ef061d06a39b537336c87e0e3d1b1 dest: flutter + # Patch: Anticipating the fix for: https://github.com/flutter/flutter/issues/163308 + - type: patch + path: update_engine_version.sh.patch \ No newline at end of file diff --git a/manifests/io.github.venera_app.venera/update_engine_version.sh.patch b/manifests/io.github.venera_app.venera/update_engine_version.sh.patch new file mode 100644 index 0000000..b482a8e --- /dev/null +++ b/manifests/io.github.venera_app.venera/update_engine_version.sh.patch @@ -0,0 +1,17 @@ +diff --git a/flutter/bin/internal/update_engine_version.sh b/flutter/bin/internal/update_engine_version.sh +index db05771..fa842e4 100755 +--- a/flutter/bin/internal/update_engine_version.sh ++++ b/flutter/bin/internal/update_engine_version.sh +@@ -16,6 +16,12 @@ set -e + + FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")" + ++# On stable, beta, and release tags, the engine.version is tracked by git - do not override it. ++TRACKED_ENGINE="$(git -C "$FLUTTER_ROOT" ls-files bin/internal/engine.version)" ++if [[ -n "$TRACKED_ENGINE" ]]; then ++ exit ++fi ++ + # Test for fusion repository + if [ -f "$FLUTTER_ROOT/DEPS" ] && [ -f "$FLUTTER_ROOT/engine/src/.gn" ]; then + BRANCH=$(git -C "$FLUTTER_ROOT" rev-parse --abbrev-ref HEAD) diff --git a/manifests/io.github.wgh136.pixes/io.github.wgh136.pixes.yml b/manifests/io.github.wgh136.pixes/io.github.wgh136.pixes.yml index 59d6b3e..0ec0a2d 100644 --- a/manifests/io.github.wgh136.pixes/io.github.wgh136.pixes.yml +++ b/manifests/io.github.wgh136.pixes/io.github.wgh136.pixes.yml @@ -60,6 +60,9 @@ modules: path: io.github.wgh136.pixes.metainfo.xml - type: git url: https://github.com/flutter/flutter.git - tag: 3.27.4 - commit: d8a9f9a52e5af486f80d932e838ee93861ffd863 + tag: 3.29.0 + commit: 35c388afb57ef061d06a39b537336c87e0e3d1b1 dest: flutter + # Patch: Anticipating the fix for: https://github.com/flutter/flutter/issues/163308 + - type: patch + path: update_engine_version.sh.patch \ No newline at end of file diff --git a/manifests/io.github.wgh136.pixes/update_engine_version.sh.patch b/manifests/io.github.wgh136.pixes/update_engine_version.sh.patch new file mode 100644 index 0000000..b482a8e --- /dev/null +++ b/manifests/io.github.wgh136.pixes/update_engine_version.sh.patch @@ -0,0 +1,17 @@ +diff --git a/flutter/bin/internal/update_engine_version.sh b/flutter/bin/internal/update_engine_version.sh +index db05771..fa842e4 100755 +--- a/flutter/bin/internal/update_engine_version.sh ++++ b/flutter/bin/internal/update_engine_version.sh +@@ -16,6 +16,12 @@ set -e + + FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")" + ++# On stable, beta, and release tags, the engine.version is tracked by git - do not override it. ++TRACKED_ENGINE="$(git -C "$FLUTTER_ROOT" ls-files bin/internal/engine.version)" ++if [[ -n "$TRACKED_ENGINE" ]]; then ++ exit ++fi ++ + # Test for fusion repository + if [ -f "$FLUTTER_ROOT/DEPS" ] && [ -f "$FLUTTER_ROOT/engine/src/.gn" ]; then + BRANCH=$(git -C "$FLUTTER_ROOT" rev-parse --abbrev-ref HEAD)