From f7d07e0bf996aa6a30709205b5f65d4c041f134b Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 11 Sep 2022 12:24:26 +0000 Subject: [PATCH 1/3] !112 Now stop use mail to collect info * Now abandon mail info collect method and delete the outdated info --- pkg/tmp/spark-store-install/feedback.sh | 2 +- 1 file changed, 1 insertion(+), 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" From aff593eba8e2d3813e53a23cfb73c0a35a6ea6d5 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 20 Sep 2022 04:12:29 +0000 Subject: [PATCH 2/3] =?UTF-8?q?!115=203.2.2=20=E5=90=AF=E5=8A=A8=20*=20upd?= =?UTF-8?q?ate=20debian/changelog.=20*=20download=E5=8F=AF=E6=97=A0root?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=EF=BC=8C=E7=9B=B8=E5=BA=94=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=88=B0=E6=9C=80=E6=96=B0?= =?UTF-8?q?=20*=20!114=20feat:=20GPU=20enable=20*=20aptss=20will=20now=20r?= =?UTF-8?q?efresh=20the=20system=20source=20before=20doing=20install,=20do?= =?UTF-8?q?wnloa=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ src/main.cpp | 8 ++++++-- tool/aptss | 42 +++++++++++++++++++++++++++++++++++------- tool/ssinstall | 4 ++-- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8938191..8a72289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (3.2.2) stable; urgency=medium + + * aptss will now refresh the system source before doing install, policy....etc + * 启动客户端GPU加速支持 + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.1) stable; urgency=medium * 更改刷新系统源的功能 diff --git a/src/main.cpp b/src/main.cpp index 7b29aeb..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"; @@ -30,7 +34,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.2.1")); + dialog.setVersion(DApplication::buildVersion("Version 3.2.2")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -51,7 +55,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2.1")); + a.setApplicationVersion(DApplication::buildVersion("3.2.2")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/tool/aptss b/tool/aptss index 7c2ddbd..e246557 100755 --- a/tool/aptss +++ b/tool/aptss @@ -1,11 +1,5 @@ #/bin/bash - - - - -if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then - if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then ###刷新apt-fast配置 mkdir -p /tmp/aptss-conf/ @@ -17,10 +11,35 @@ chmod -R 755 /tmp/aptss-conf fi + + + + + + + +if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then + DEPEND=`which apt-fast` if [ "$DEPEND" = "" ] ; then echo "未安装依赖：apt-fast 开始安装" -sudo aptss ssupdate && 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 install apt-fast -y +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 + +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" + +###执行 +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" = "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 ###执行 @@ -30,6 +49,15 @@ bwrap --dev-bind / / \ 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" + +###执行 +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 "$@" --allow-downgrades + elif [ "$1" = "ssupdate" ];then mkdir -p /tmp/aptss-conf/ diff --git a/tool/ssinstall b/tool/ssinstall index db7ee0a..749d336 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -65,7 +65,7 @@ fi if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- -echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf +echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf fi @@ -90,7 +90,7 @@ fi if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- -dpkg -i $1 || aptss ssupdate && aptss install -yf +dpkg -i $1 || aptss install -yf fi From 81993625ba572f04c778f622376116d9a395b80f Mon Sep 17 00:00:00 2001 From: lisuke <1657787678@qq.com> Date: Tue, 27 Sep 2022 12:14:48 +0000 Subject: [PATCH 3/3] =?UTF-8?q?!120=20=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=20fakeroot=20*=20=E6=B7=BB=E5=8A=A0=20fakero?= =?UTF-8?q?ot=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index fb2f7bf..66f300c 100644 --- a/README.zh.md +++ b/README.zh.md @@ -26,7 +26,7 @@ Deepin V20/UOS 21 系统下, 安装依赖 ```shell -sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev +sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot ```