update debian/control.

Merge pull request !30 from shenmo/master

debian/changelog

@@ -1,3 +1,14 @@
+spark-store (3.0.3-12) stable; urgency=medium
+
+  * Rollback to use DApplication::loadDXcbPlugin() to make titlebar behave normally in ubuntu
+  * Now can run on Debian 11
+  * Now can run on Ubuntu 22.04
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
 spark-store (3.0.3-11) stable; urgency=medium
 
   * Now support autoupdate

debian/control

@@ -11,9 +11,9 @@ Build-Depends:
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore-dev(>=5.4),
- libdtkgui-dev(>=5.4),
- libdtkwidget-dev(>=5.4),
+ libdtkcore-dev(>=5.2),
+ libdtkgui-dev(>=5.2),
+ libdtkwidget-dev(>=5.2),
  qttools5-private-dev,
  libnotify-dev,
  qtwebengine5-dev
@@ -29,9 +29,11 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore5(>=5.4),
- libdtkgui5(>=5.4),
- libdtkwidget5(>=5.4),
- libnotify4
+ libdtkcore5(>=5.2),
+ libdtkgui5(>=5.2),
+ libdtkwidget5(>=5.2),
+ libnotify4,
+ curl,
+ dde-qt5integration
 Description: Spark Store
  A community powered app store, based on DTK.

debian/spark-store.postinst

@@ -20,7 +20,7 @@ case "$1" in
 		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
 
         	# Run apt update to avoid users being fucked up by the non-exist dependency problem
-        	apt update
+        	apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 
 		# Create symbo links to start upgrade detect
 		ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart/spark-update-notifier.desktop

debian/spark-store.preinst

@@ -0,0 +1,27 @@
+#!/bin/bash
+#检测网络链接畅通
+function network-check()
+{
+    #超时时间
+    local timeout=1
+
+    #目标网站
+    local target=www.baidu.com
+
+    #获取响应状态码
+    local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
+
+    if [ "x$ret_code" = "x200" ]; then
+        echo "Network Checked successful ! Continue..."
+	 echo "网络通畅，继续安装"
+    else
+        #网络不畅通
+	echo "Network failed ! Cancel the installation"
+	echo "网络不畅，终止安装"
+	exit -1
+    fi
+
+}
+
+
+network-check

src/main.cpp

@@ -10,7 +10,7 @@
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
-    //DApplication::loadDXcbPlugin();  // 已废弃
+    DApplication::loadDXcbPlugin();  // 已废弃，但是对于非deepin桌面可以正常使用标题栏
     DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);    // 开启 Hidpi 支持
     // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
     QVector<char*> fakeArgs(argc + 2);
@@ -50,7 +50,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.0.3-11"));
+    a.setApplicationVersion(DApplication::buildVersion("3.0.3-12"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

tool/update-upgrade/ss-update-controler.sh

@@ -11,7 +11,8 @@ echo "本脚本的开发者不对使用该脚本可能造成的后果负责"
 echo
 echo
 echo
-echo "请按任意键继续..."
+echo "请按回车继续..."
+#"只有回车可以用啊！""啊？"“你说的任意都行啊”“唔。。。戳到我的盲区了”
 read
 
 reset