gxde-wm-shim

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.github/workflows/building-deb-hetao.yml

@@ -0,0 +1,34 @@
+name: Building GXDE Package (hetao)
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_call:
+    secrets:
+      PASSWD:
+        required: true
+      USERS:
+        required: true
+      HOST: 
+        required: true
+      UPATH: 
+        required: true
+      UPROGRAM: 
+        required: true
+      UPORT: 
+        required: true
+
+env:
+  REPOSITORY: https://github.com/GXDE-OS/GXDE  
+  BOTTLEPATH: system-bottle
+
+jobs:  
+  call-loong64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-hetao
+      arch: loong64
+      rootfs-codename: crimson
+      rootfs-source: https://community-packages.deepin.com/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao

.github/workflows/building-deb-newest.yml

@@ -37,6 +37,6 @@ jobs:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
     secrets: inherit
 
-  call-meimei:
+  call-hetao:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
     secrets: inherit

.github/workflows/building-deb.yml

@@ -26,8 +26,8 @@ jobs:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
     secrets: inherit
   
-  call-meimei:
+  call-hetao:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
     secrets: inherit
   
   call-tianlu:

.github/workflows/configure-building-enviroment-base-system.sh

@@ -18,6 +18,9 @@ function useDebianPort() {
 function useLoongnix() {
     sudo cp .github/workflows/loongnix /usr/share/debootstrap/scripts/ -v
 }
+function useDeepin25() {
+    sudo cp .github/workflows/crimson /usr/share/debootstrap/scripts/ -v
+}
 
 sudo apt update
 sudo apt install debootstrap rename binfmt-support qemu-user qemu-user-static git -y
@@ -32,7 +35,16 @@ else
         useLoongnix
     fi
 fi
-sudo debootstrap --no-check-gpg --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+if [[ $2 == "crimson" ]]; then
+    useDeepin25
+    sudo debootstrap --no-check-gpg --include=git,deepin-keyring,gcc,make,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+else
+    sudo debootstrap --no-check-gpg --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+fi
+
+if [[ $2 == "crimson" ]]; then
+    sudo sed -i "s/main/main commercial community/g" $bottlePath/etc/apt/sources.list
+fi
 #if [[ $? != 0 ]]; then
 #    sudo debootstrap --foreign --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5 
 #fi
@@ -67,6 +79,9 @@ case $2 in
     "loongnix")
         env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh meimei
     ;;
+    "crimson")
+        env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh hetao
+    ;;
     *)
         env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
     ;;

.github/workflows/crimson

@@ -0,0 +1,17 @@
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
+default_mirror https://community-packages.deepin.com/deepin/beige/
+
+# include common settings
+if [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/scripts/debian-common"
+elif [ -e /debootstrap/debian-common ]; then
+ . /debootstrap/debian-common
+elif [ -e "$DEBOOTSTRAP_DIR/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/debian-common"
+else
+ error 1 NOCOMMON "File not found: debian-common"
+fi

debian/changelog

@@ -1,4 +1,4 @@
-gxde (2025.06.09) UNRELEASED; urgency=medium
+gxde (2025.06.11) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
@@ -11,7 +11,8 @@ gxde (2025.06.09) UNRELEASED; urgency=medium
   * 修改 dde-session-ui、dde-file-manager、dde-desktop 为
     gxde-session-ui、gxde-file-manager、gxde-desktop-panel
   * startdde=>startgxde
-
+  * dde-kwin --> gxde-wm-shim
+  
  -- gfdgd_xi <3025613752@qq.com>  Mon, 09 Jun 2025 07:42:12 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium

debian/control

@@ -101,7 +101,7 @@ Depends: ${misc:Depends},
  eject,
  gxde-wallpapers,
  fonts-noto,
- dde-kwin | gxde-kwin,
+ gxde-wm-shim | gxde-kwin-neo,
  deepin-screensaver,
  gxde-default-settings,
  gxde-shell-tools,