From 21a5636a0702c22a2b814d6fe3ae96a3403f163f Mon Sep 17 00:00:00 2001 From: shenmo <jifengshenmo@outlook.com> Date: Sat, 17 Aug 2024 06:14:48 +0000 Subject: [PATCH 1/4] update debian/changelog. Signed-off-by: shenmo <jifengshenmo@outlook.com> --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index b30f3e4..c7d74cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ + +spark-store (4.3) stable; urgency=medium + +* 修复客户端不支持301跳转的问题 +* 修复UOS下错误地提示开发者模式未启动 +* 现在会记住上次的窗口大小 +* 删除无用依赖,修复Debian 13依赖问题 + + + -- shenmo <shenmo@spark-app.store> Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.14) stable; urgency=medium * Adapt to Qt6 and Dtk6 From 6f4fe1a8238ebc82f35148ba4e0c684b9368681d Mon Sep 17 00:00:00 2001 From: shenmo <jifengshenmo@outlook.com> Date: Sat, 17 Aug 2024 07:03:21 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!278?= =?UTF-8?q?=20:=20enhance:=20Internal=20requests=20follow=20301=20redirect?= =?UTF-8?q?s'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/sparkapi.cpp | 2 -- src/pages/appintopage.cpp | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/backend/sparkapi.cpp b/src/backend/sparkapi.cpp index 2947108..8c64d1c 100644 --- a/src/backend/sparkapi.cpp +++ b/src/backend/sparkapi.cpp @@ -28,7 +28,6 @@ void SparkAPI::get(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { QByteArray arr = data.toUtf8(); @@ -54,7 +53,6 @@ void SparkAPI::getRAW(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { emit finishedRAW(data); diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index ccf3303..2d4fdd3 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -73,7 +73,6 @@ void AppIntoPage::openUrl(const QUrl &url) iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png")); iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); - iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); iconManager->get(iconRequest); QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) @@ -97,7 +96,6 @@ void AppIntoPage::openUrl(const QUrl &url) request.setUrl(QUrl(imgUrl)); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); manager->get(request); QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) { @@ -116,10 +114,10 @@ void AppIntoPage::openUrl(const QUrl &url) qDebug() << imgUrl; } - manager->deleteLater(); + manager->deleteLater(); }); } - + /** * NOTE: No need to judget developmode status From 28bd302506264b65a27b1d0959c92817ea82623c Mon Sep 17 00:00:00 2001 From: shenmo <jifengshenmo@outlook.com> Date: Sat, 17 Aug 2024 07:20:35 +0000 Subject: [PATCH 3/4] remove aptss cmake config Signed-off-by: shenmo <jifengshenmo@outlook.com> --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1d7a1d..b5bc88e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE install(TARGETS ${PROJECT_NAME} DESTINATION /opt/durapps/${PROJECT_NAME}/bin) install(DIRECTORY ${CMAKE_SOURCE_DIR}/tool/ DESTINATION /opt/durapps/${PROJECT_NAME}/bin USE_SOURCE_PERMISSIONS) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/${CMAKE_INSTALL_SYSCONFDIR}/aptss DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS) install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/lib/ DESTINATION /lib USE_SOURCE_PERMISSIONS) install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/tmp/ DESTINATION /tmp USE_SOURCE_PERMISSIONS) install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/usr/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS) From 2688b8b41850fb28fe185bdbec55e863bc7c9b83 Mon Sep 17 00:00:00 2001 From: Zhiyuan Li <uniartisan2017@gmail.com> Date: Mon, 19 Aug 2024 14:10:43 +1000 Subject: [PATCH 4/4] =?UTF-8?q?FIX:=20=E6=B8=B2=E6=9F=93=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index a28f529..d3bee24 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -75,7 +75,7 @@ void crashHandler(int sig) { gatherInfo(popen("LANG=en_US.UTF-8 lsb_release -a", "r"), logFile, "Distribution info"); gatherInfo(popen("LANG=en_US.UTF-8 lscpu", "r"), logFile, "All CPU Info"); gatherInfo(popen("LANG=en_US.UTF-8 free -h | grep Mem | awk '{print $2}'", "r"), logFile, "Memory Size"); - + logFile << "Error: signal " << sig << ":\n"; @@ -144,6 +144,8 @@ int main(int argc, char *argv[]) // 浏览器开启 GPU 支持 // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls"); // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security"); + // 全平台软件渲染Webkit + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu"); #if defined (__sw_64__) || defined (__loongarch__) qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox"); #endif