From e7680fe2a03acda11f1ee2233d19de358571f2b6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 20 Sep 2022 04:03:09 +0000 Subject: [PATCH 1/3] =?UTF-8?q?!114=20feat:=20GPU=20enable=20*=20Merge=20r?= =?UTF-8?q?emote-tracking=20branch=20'upstream/master'=20into=20dev=20*=20?= =?UTF-8?q?Merge=20remote-tracking=20branch=20'upstream/dev'=20into=20dev?= =?UTF-8?q?=20*=20feat:=20enable=20GPU=20*=20!113=203.2.1=20merge=20*=20!1?= =?UTF-8?q?12=20Now=20stop=20use=20mail=20to=20collect=20info=20*=20Merge?= =?UTF-8?q?=20remote-tracking=20branch=20'upstream/dev'=20into=20dev=20*?= =?UTF-8?q?=20Merge=20branch=20'dev'=20of=20gitee.com:uniartisan2018/spark?= =?UTF-8?q?-store=20into=20dev=20*=20feat:=20=E6=B8=85=E9=99=A4=E7=BD=91?= =?UTF-8?q?=E9=A1=B5=E7=BC=93=E5=AD=98=20*=20=E6=96=87=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20*=20update=20src/widget.ui.=20*=20feat:=20=E6=98=9F?= =?UTF-8?q?=E7=81=AB=E5=BA=94=E7=94=A8=E5=95=86=E5=BA=97=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/tmp/spark-store-install/feedback.sh | 2 +- src/main.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/tmp/spark-store-install/feedback.sh b/pkg/tmp/spark-store-install/feedback.sh index e668d77..007f976 100755 --- a/pkg/tmp/spark-store-install/feedback.sh +++ b/pkg/tmp/spark-store-install/feedback.sh @@ -6,4 +6,4 @@ Subject: spark-store_3.0.2: $(lsb_release -a | grep "Description" | sed -e "s#\t $(uname -a)" | tee /tmp/spark-store-install/feedback.txt > /dev/null -curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "sparkstorefeedback@163.com" --upload-file /tmp/spark-store-install/feedback.txt --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY" +curl -s --url "smtp://smtp.163.com" --mail-from "${MAIL_FEEDBACK}" --mail-rcpt "${MAIL_FEEDBACK}" --upload-file /tmp/spark-store-install/feedback.txt --user "${MAIL_FEEDBACK}:${M}AIL_AUTH" diff --git a/src/main.cpp b/src/main.cpp index aca4f69..5aacfdb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,10 @@ int main(int argc, char *argv[]) DApplication::loadDXcbPlugin(); // 已废弃，但是对于非deepin桌面可以正常使用标题栏 DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持 // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题 + + // 浏览器开启 GPU 支持 + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); + QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; fakeArgs[1] = "-platformtheme"; From 11d68fb4b5f49dda0eae3328360000187738f4b1 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 20 Sep 2022 04:05:25 +0000 Subject: [PATCH 2/3] =?UTF-8?q?download=E5=8F=AF=E6=97=A0root=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E7=9B=B8=E5=BA=94=E7=9A=84=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=88=B0=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- tool/aptss | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tool/aptss b/tool/aptss index 15d96a5..e246557 100755 --- a/tool/aptss +++ b/tool/aptss @@ -18,7 +18,7 @@ fi -if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then +if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then DEPEND=`which apt-fast` if [ "$DEPEND" = "" ] ; then @@ -35,6 +35,20 @@ bwrap --dev-bind / / \ apt-fast "$@" --allow-downgrades +elif [ "$1" = "download" ];then +DEPEND=`which apt-fast` +if [ "$DEPEND" = "" ] ; then +echo "未安装依赖：apt-fast 开始安装" +aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y +fi + +###执行 +bwrap --dev-bind / / \ + --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \ + --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \ + apt-fast "$@" --allow-downgrades + + elif [ "$1" = "policy" ] || [ "$1" = "search" ];then sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0" From beaeac60a37a6ba686daec1c381c0cab6c1e089e Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 20 Sep 2022 04:11:58 +0000 Subject: [PATCH 3/3] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec67721..8a72289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ spark-store (3.2.2) stable; urgency=medium - * aptss will now refresh the system source before doing install, download, policy....etc - + * aptss will now refresh the system source before doing install, policy....etc + * 启动客户端GPU加速支持 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800