Revert "Merge branch 'Thunder' of gitee.com:spark-store-project/spark-store into dev"

This reverts commit 5b018a4696.

debian/control

@@ -3,18 +3,16 @@ Maintainer: shenmo <shenmo@spark-app.store>
 Section: utils
 Priority: optional
 Build-Depends:
- cmake,
- debhelper (>= 11),
+ debhelper (>= 9),
  pkg-config,
- qtchooser (>= 55-gc9562a1-1~),
- qt6-base-dev,
- qt6-svg-dev,
- qt6-tools-dev,
- qt6-webengine-dev,
- libdtkcommon-dev,
- libdtk6core-dev,
- libdtk6gui-dev,
- libdtk6widget-dev
+ qtchooser (>= 55-gc9562a1-1~) | qt5-default,
+ qtbase5-dev,
+ libqt5svg5-dev,
+ qttools5-dev-tools,
+ qtwebengine5-dev,
+ libdtkcore-dev (>= 5.0),
+ libdtkgui-dev (>= 5.0),
+ libdtkwidget-dev (>= 5.0)
 Standards-Version: 4.1.7
 Homepage: https://www.spark-app.store/
 
@@ -22,11 +20,10 @@ Package: spark-store
 Architecture: any
 Provides: spark-store-console-in-container
 Depends: ${shlibs:Depends}, ${misc:Depends},
- dde-qt6integration,
+ dde-qt5integration,
  curl,
  openssl,
  aria2,
- qtwayland5,
  gnupg,
  zenity,
  policykit-1 | pkexec,

debian/rules

@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/default.mk
-
-export QT_SELECT = qt6
+export QT_SELECT = qt5
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-DEB_CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS)
-DEB_CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS)
-DEB_CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS)
+include /usr/share/dpkg/default.mk
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -21,14 +16,24 @@ SOURCE_DATE_EPOCH := $(shell date +%s)
 %:
 	dh $@ --parallel
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-	-DVERSION=$(DEB_VERSION_UPSTREAM) \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_C_FLAGS="$(DEB_CFLAGS) $(DEB_CPPFLAGS)" \
-	-DCMAKE_CXX_FLAGS="$(DEB_CXXFLAGS) $(DEB_CPPFLAGS)"
+override_dh_auto_clean:
+	rm -rf $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
 
-#Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
-#Qt Mutidedia lib will ref to network libraray.
+override_dh_auto_configure:
+	mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
+
+	qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
+	-spec linux-g++ CONFIG+=force_debug_info \
+	-o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/
+
+override_dh_auto_build:
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) -j$(JOBS)
+
+override_dh_auto_install:
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) install \
+	INSTALL_ROOT=$(CURDIR)/debian/spark-store
+
+# Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
+# Qt Mutidedia lib will ref to network libraray.
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0

debian/spark-store.postinst

@@ -2,6 +2,7 @@
 
 case "$1" in
 	configure)
+
 		case `arch` in
    			x86_64)
 				echo "Enabling i386 arch..."
@@ -11,8 +12,7 @@ case "$1" in
         		aarch64)
         			echo "Will not enable armhf since 4271"
 			;;
-
-			loongarch64)
+            loongarch64)
 				echo "Nope we DO NOT WANT ABI1 now"
 				dpkg --remove-architecture loongarch64
 			;;
@@ -51,9 +51,11 @@ case "$1" in
 		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
 
 
+
 		# Start upgrade detect service
 		systemctl daemon-reload
-		systemctl enable spark-update-notifier --now || true
+		systemctl enable spark-update-notifier
+		systemctl start spark-update-notifier
 
 
 		# Update certain caches
@@ -70,6 +72,7 @@ case "$1" in
 	;;
 
 	triggered)
-		spark-dstore-patch
+			spark-dstore-patch
+
 	;;
 esac

debian/spark-store.preinst

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 #检测网络链接畅通
 function network-check()
 {
@@ -24,5 +23,6 @@ function network-check()
 
 }
 
+
 #network-check
-#echo "不再检测网络"
+echo "不再检测网络"

debian/spark-store.prerm

@@ -12,7 +12,6 @@ function notify-send()
 }
 
 if [ "$1" = "remove" -o "$1" = "purge" ] ; then
-
 	echo "$1"
 	echo "卸载操作，进行配置清理"
 
@@ -33,29 +32,33 @@ if [ "$1" = "remove" -o "$1" = "purge" ] ; then
 	# Remove residual symbol links to stop upgrade detect
 	rm -f /etc/xdg/autostart/spark-update-notifier.desktop
 	# Remove config files
-	for username in `ls /home`; do
-		echo /home/$username
-		if [ -d /home/$username/.config/spark-union/spark-store ]; then
-			rm -rf /home/$username/.config/spark-union/spark-store
-		fi
-	done
+for username in `ls /home`      
+    do
+      echo /home/$username
+        if [ -d /home/$username/.config/spark-union/spark-store ]
+        then
+        rm -rf /home/$username/.config/spark-union/spark-store
+        fi
+    done
 
 
 	# Shutdown services
-	systemctl disable spark-update-notifier --now || true
+	systemctl stop spark-update-notifier
+	# Stop update detect service
+	systemctl disable spark-update-notifier
 
 
 
 	# Remove gpg key file
 	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
 	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
-
 else
-
+	
 	if [ ! -z "`pidof spark-store`" ] ; then
 		echo "关闭已有 spark-store.."
 		notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store
 		killall spark-store
 	fi
-
 fi
+
+