From 0ba0587e1770706ca144e2601ea7691aa18dab08 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 22 Apr 2023 09:17:14 +0000 Subject: [PATCH 1/4] fix I6XTK0 Signed-off-by: shenmo --- tool/update-upgrade/ss-do-upgrade-worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index ac76cd0..6271cce 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -12,7 +12,7 @@ case $1 in ;; upgradable-list) - output=$(env LANGUAGE=en_US apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1) + output=$(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1) IFS_OLD="$IFS" IFS=$'\n' From f5a35a332af77ae89fb6e73aa610f0c6d431cb99 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 22 Apr 2023 09:18:46 +0000 Subject: [PATCH 2/4] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fc31055..cf0c994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (4.2.6.1) stable; urgency=medium + * 修复：mint下更新检测不正常 + + -- shenmo + + spark-store (4.2.6) stable; urgency=medium * 修复：截图加载失败时点击闪退 From 842f0893b3654633d6c94076d1f43400972f8d88 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 25 Apr 2023 18:41:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=AF=E6=8C=81arm=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ src/backend/sparkapi.cpp | 1 + src/pages/applistpage.cpp | 18 +++++------------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf0c994..b6f8502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (4.2.6.2) stable; urgency=medium + * 新增：支持arm架构搜索 + + -- shenmo + + spark-store (4.2.6.1) stable; urgency=medium * 修复：mint下更新检测不正常 diff --git a/src/backend/sparkapi.cpp b/src/backend/sparkapi.cpp index eb30947..8535528 100644 --- a/src/backend/sparkapi.cpp +++ b/src/backend/sparkapi.cpp @@ -7,6 +7,7 @@ QString SparkAPI::serverUrl = ""; #ifdef __x86_64__ QString SparkAPI::serverUrlDir = "store"; + #elif __aarch64__ QString SparkAPI::serverUrlDir = "aarch64-store"; #endif diff --git a/src/pages/applistpage.cpp b/src/pages/applistpage.cpp index 2a2e057..29c1f18 100644 --- a/src/pages/applistpage.cpp +++ b/src/pages/applistpage.cpp @@ -40,30 +40,18 @@ void AppListPage::getAppList(QString type) if (isDark) { theme = "theme=dark"; - #ifdef __aarch64__ - theme = "dark"; - #endif } else { theme = "theme=light"; - #ifdef __aarch64__ - theme = ""; - #endif } if (type == "") { url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme; - #ifdef __aarch64__ - url = api->getServerUrl() + "aarch64-store/#/"+ theme; - #endif } else { url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme; - #ifdef __aarch64__ - url = api->getServerUrl() + "aarch64-store/#/"+ theme + type; - #endif } ui->webEngineView->setUrl(url); @@ -85,7 +73,11 @@ void AppListPage::getSearchList(const QString &keyword) { theme = "theme=light"; } - url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme; + + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=x86"; + #ifdef __aarch64__ + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=aarch64"; + #endif ui->webEngineView->setUrl(url); delete api; } From cb66f5e90352a2c8d47ce0e666bb5e795d5f4675 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 25 Apr 2023 19:29:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?arm=E6=9E=B6=E6=9E=84applist=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/applistpage.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/applistpage.cpp b/src/pages/applistpage.cpp index 29c1f18..38f5f56 100644 --- a/src/pages/applistpage.cpp +++ b/src/pages/applistpage.cpp @@ -47,11 +47,17 @@ void AppListPage::getAppList(QString type) } if (type == "") { - url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme; + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=x86"; + #ifdef __aarch64__ + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=aarch64"; + #endif } else { - url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme; + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=x86"; + #ifdef __aarch64__ + url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=aarch64"; + #endif } ui->webEngineView->setUrl(url);