gxde-wm-shim

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

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

@@ -59,6 +59,7 @@ env:
 
 jobs:  
   build:
+    if: github.repository_owner == 'GXDE-OS'
     name: ${{ inputs.display-name || 'Build Job' }}
     runs-on: ubuntu-24.04
     steps:

.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

@@ -0,0 +1,42 @@
+name: Building GXDE Package for Newest Release
+run-name: Building for Newest Release ${{ 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-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-tianlu
+      arch: loong64
+      rootfs-codename: sid
+      rootfs-source: https://deb.debian.org/debian-ports/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+
+  call-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
+    secrets: inherit
+
+  call-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
+    secrets: inherit

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

@@ -31,4 +31,8 @@ jobs:
       rootfs-codename: sid
       rootfs-source: https://deb.debian.org/debian-ports/
       gxde-codename: bixie
-      gxde-codename-upload: tianlu
+      gxde-codename-upload: tianlu
+
+  call-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
+    secrets: inherit

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

@@ -55,16 +55,7 @@ jobs:
       gxde-codename: lizhi
       gxde-codename-upload: zhuangzhuang
 
-  call-mips64el-zhuangzhuang:
+
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: mips64el-zhuangzhuang
-      arch: mips64el
-      rootfs-codename: trixie
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: lizhi
-      gxde-codename-upload: zhuangzhuang
 
   call-riscv64-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master

.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:
@@ -35,6 +35,7 @@ jobs:
     secrets: inherit
 
   UploadOBS:
+    if: github.repository_owner == 'GXDE-OS'
     runs-on: ubuntu-latest
     steps:
       - name: Get REPOSITORY Name

.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/configure-building-enviroment.sh

@@ -58,9 +58,9 @@ apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring de
 #apt build-dep qemu -y
 # 如果是 Debian10 就需要安装 Python3 的依赖
 #apt build-dep python3.7 -y
-# 解包 deepin-desktop-base
+# 解包 gxde-desktop-base
-apt download deepin-desktop-base
+apt download gxde-desktop-base
-dpkg -x deepin-desktop-base_*.deb /
+dpkg -x gxde-desktop-base_*.deb /
 if [[ -f /etc/apt/sources.list.d/debian-backports.list ]]; then
     dch --bpo ""
     sed -i "s/~bpo/-bpo/g" debian/changelog

.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

README.zh.md

@@ -2,6 +2,8 @@
 <hr>
 <a href='https://gitee.com/GXDE-OS/GXDE/stargazers'><img src='https://gitee.com/GXDE-OS/GXDE/badge/star.svg?theme=dark' alt='star'></img></a>
 
+![G-Start](https://gitcode.com/GXDE-OS/GXDE/star/badge.svg)  
+
 
 **[English](/README.md)**
 

debian/changelog

@@ -1,4 +1,4 @@
-gxde (2025.05.07) UNRELEASED; urgency=medium
+gxde (2025.06.11) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
@@ -7,8 +7,13 @@ gxde (2025.05.07) UNRELEASED; urgency=medium
   * 新增推荐依赖：龙芯应用合作社（仅限：mips64el loongarch64 loong64）
   * 移除推荐依赖：plank
   * 修复小小电脑无法正常更新 gxde-desktop-android 的问题
-
+  * 修改 dde-control-center、dde-launcher、dde-dock、deepin-desktop-base 为 gxde-control-center、gxde-launcher、gxde-dock、gxde-desktop-base
- -- gfdgd_xi <3025613752@qq.com>  Wed, 07 May 2025 12:14:19 +0800
+  * 修改 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

@@ -53,7 +53,6 @@ Depends:
  ${misc:Depends},
  gxde-daemon,
  gxde-desktop,
- gxde-calculator, 
  gxde-terminal, 
  gxde-deb-installer, 
  gxde-editor, 
@@ -65,8 +64,8 @@ Depends:
  gxde-quick-hash, 
  spark-store | aptss, 
  deepin-system-monitor,
- dde-control-center,
+ gxde-control-center,
- dde-file-manager,
+ gxde-file-manager,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -89,20 +88,20 @@ Description: GXDE New Desktop Environment For PRoot - Next
 Package: gxde-desktop
 Architecture: all
 Depends: ${misc:Depends},
- deepin-desktop-base,
+ gxde-desktop-base,
- dde-desktop,
+ gxde-desktop-panel,
- dde-dock,
+ gxde-dock,
- dde-control-center(>> 2.90.5),
+ gxde-control-center,
- dde-launcher,
+ gxde-launcher,
- startdde,
+ startgxde,
- dde-session-ui,
+ gxde-session-ui,
  gxde-artwork,
- dde-file-manager,
+ gxde-file-manager,
  dde-qt5integration,
  eject,
  gxde-wallpapers,
  fonts-noto,
- dde-kwin | gxde-kwin,
+ gxde-wm-shim | gxde-kwin-neo,
  deepin-screensaver,
  gxde-default-settings,
  gxde-shell-tools,
@@ -146,7 +145,6 @@ Recommends:
  x-display-manager,
  gxde-image-viewer,
  gxde-calendar,
- gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,
  warm-sched,
@@ -160,7 +158,6 @@ Recommends:
  fantascene-dynamic-wallpaper,
  x11vnc,
 Conflicts:
- dde-control-center(<< 2.90.5),
  deepin-desktop-environment-desktop,
  deepin-desktop-environment-dock,
  deepin-desktop-environment-launcher,