版本号弄错了

Merge pull request !1 from shenmo/master

.github/workflows/building-deb.yml

@@ -0,0 +1,200 @@
+name: Building GXDE Testing Package
+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:  
+  amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh amd64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+            
+
+
+  arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh arm64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+  
+
+  mips64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh mips64el bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+  
+  loong64:
+    runs-on: ubuntu-latest
+    container: debian:sid
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://mirror.sjtu.edu.cn/debian-ports/
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+      

.github/workflows/building.yml

@@ -0,0 +1,13 @@
+name: Building Testing
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+    secrets: inherit

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

@@ -0,0 +1,48 @@
+#!/bin/bash
+# $1=arm64
+# $2=buster
+
+function getd23debootstrap() {
+    git clone https://github.com/deepin-community/debootstrap --depth=1
+    cd debootstrap
+    sudo apt build-dep . -y
+    dpkg-buildpackage -b
+    sudo apt install ../*.deb -y --allow-downgrades
+    cd ..
+    sudo cp deepin-archive-camel-keyring.gpg /etc/apt/trusted.gpg.d/deepin-archive-camel-keyring.gpg -rv
+}
+function useDebianPort() {
+    sudo apt install debian-ports-archive-keyring -y
+    sudo cp /usr/share/keyrings/debian-archive-keyring.gpg /usr/share/keyrings/debian-ports-archive-keyring.gpg -v
+}
+
+sudo apt update
+sudo apt install debootstrap qemu-user-static git -y
+bottlePath=./system-bottle
+if [[ $2 == "beige" ]]; then
+    getd23debootstrap
+else
+    if [[ $1 == "loong64" ]]; then
+        useDebianPort
+    fi
+fi
+sudo debootstrap --arch=$1 $2 $bottlePath $5
+if [[ $? != 0 ]] && [[ $1 == loong64 ]]; then
+    sudo apt install squashfs-tools git -y
+    wget https://github.com/GXDE-OS/GXDE/releases/download/resources/debian-base-loong64.squashfs
+    sudo unsquashfs debian-base-loong64.squashfs
+    sudo rm -rf $bottlePath/
+    sudo mv squashfs-root $bottlePath -v
+fi
+sudo bash .github/workflows/pardus-chroot $bottlePath
+# 配置 git
+sudo chroot $bottlePath apt update
+sudo chroot $bottlePath apt full-upgrade -y
+sudo chroot $bottlePath apt install git -y
+sudo chroot $bottlePath git clone $3 --depth=1
+sudo chroot $bottlePath git clone $4 --depth=1
+sudo mv $bottlePath/$(basename $3)/.github/workflows/* $bottlePath/$(basename $4)/.github/workflows -v
+# 修改版本号
+#sudo sed -i "s/) UNRELEASED; urgency=medium/~$2) UNRELEASED; urgency=medium/g" $bottlePath/deep-wine-runner-qemu-system/debian/changelog
+env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
+exit 0

.github/workflows/configure-building-enviroment-mac.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
+brew install libffi gettext glib pkg-config autoconf automake pixman ninja
+exit 0

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

@@ -0,0 +1,48 @@
+#!/bin/bash
+export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
+#mkdir -p /etc/apt/sources.list.d/
+#cp /etc/apt/sources.list /etc/apt/sources.list.d/sources.list
+#sed -i "s/deb /deb-src /g" /etc/apt/sources.list.d/sources.list
+#cat /etc/apt/sources.list
+#cat /etc/apt/sources.list.d/sources.list
+# 判断系统版本
+#cat /etc/issue | grep 12
+#if [[ $? == 0 ]]; then  
+#    echo "deb-src http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/debian-sources.list
+#fi
+#cat /etc/issue | grep sid
+#if [[ $? == 0 ]]; then  
+#    echo "deb-src http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/debian-sources.list
+#fi
+# 写入 GXDE 源
+echo "deb [trusted=true] https://repo-gxde.gfdgdxi.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+echo "deb [trusted=true] https://repo-gxde.gfdgdxi.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+if [[ $1 == "loong64" ]]; then
+    echo "deb [trusted=true] http://mirror.sjtu.edu.cn/debian-ports unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
+fi
+apt update
+apt install dpkg-dev sudo neofetch -y
+neofetch
+#if [[ `arch` != "x86_64" ]]; then
+#    apt source qemu
+#    cd qemu-*/
+#    sed -i "s/gcc-s390x-linux-gnu,//g" debian/control
+#    sed -i "s/gcc-alpha-linux-gnu,//g" debian/control
+#    sed -i "s/gcc-sparc64-linux-gnu,//g" debian/control
+#    sed -i "s/gcc-powerpc64-linux-gnu,//g" debian/control
+#    sed -i "s/gcc-hppa-linux-gnu,//g" debian/control
+#    sed -i "s/gcc-riscv64-linux-gnu,//g" debian/control
+#    apt build-dep . -y
+#    cd ..
+#fi
+#apt build-dep qemu -y
+# 如果是 Debian10 就需要安装 Python3 的依赖
+#apt build-dep python3.7 -y
+for i in {1..5};
+do
+    apt build-dep . -y
+    if [[ $? == 0 ]]; then
+        break
+    fi
+done
+exit 0

.github/workflows/configure-python3.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+CPU_CORES=$(($(grep -c processor < /proc/cpuinfo)*2))
+make build-python -j$CPU_CORES
+make install-to-qemu-python -j$CPU_CORES
+exit 0

.github/workflows/pardus-chroot

@@ -0,0 +1,38 @@
+#!/bin/bash
+set +e
+DESTDIR="$1"
+if [[ $UID -ne 0 ]] ; then
+    echo "You must be root!"
+    exit 1
+fi
+if [[ -b "$1" ]] ; then
+    DESTDIR=$(mktemp -d)
+    mount "$1" "$DESTDIR"
+fi
+shift
+if [[ "$DESTDIR" == "" ||  ! -f "$DESTDIR/etc/os-release" ]] ; then
+    echo "Target filesystem is invalid: $DESTDIR"
+    exit 1
+fi
+mount --bind /dev "$DESTDIR/dev"
+mount --bind /run  "$DESTDIR/run"
+mount --bind /media  "$DESTDIR/media"
+mount -t devpts devpts "$DESTDIR/dev/pts"
+mount -t sysfs sysfs "$DESTDIR/sys"
+mount -t proc proc "$DESTDIR/proc"
+mount -t tmpfs tmpfs  "$DESTDIR/dev/shm"
+mount --bind /tmp "$DESTDIR/tmp"
+#if [[ -d /sys/firmware/efi/ ]] ; then
+#    mount -t efivarfs efivarfs  "$DESTDIR/sys/firmware/efi/efivars"
+#fi
+#cat /etc/resolv.conf > $DESTDIR/etc/resolv.conf
+#SHELL=/bin/bash unshare --fork --pid chroot "$DESTDIR" "$@"
+#exit
+# 下面的因为有问题，不使用
+#if [[ -d /sys/firmware/efi/ ]] ; then
+#    while umount "$DESTDIR/sys/firmware/efi/efivars" 2>/dev/null ; do : ;done
+#fi
+#for dir in dev/pts dev/shm dev sys proc run media ; do
+#    while umount "$DESTDIR/$dir" 2>/dev/null; do : ;done
+#done
+#umount -lf "$DESTDIR"  2>/dev/null

.github/workflows/run-command-in-chroot.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+bottlePath=./system-bottle
+#gitPath=
+sudo chroot $bottlePath bash -c "cd $gitPath ; $*"

README.md

@@ -1,4 +1,4 @@
-<p width=100px align="center"><img width=256 src="icon.svg"></p>
+![Logo](new-logo-long.png)
 <h1 align="center">GXDE</h1>
 <hr>
 <a href='https://gitee.com/gfdgd-xi/debian-dde/stargazers'><img src='https://gitee.com/gfdgd-xi/debian-dde/badge/star.svg?theme=dark' alt='star'></img></a>

builder-example/building.yml

@@ -0,0 +1,13 @@
+name: Building Testing
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+    secrets: inherit

debian/changelog

@@ -1,10 +1,8 @@
-gxde (2024.08.25) UNRELEASED; urgency=medium
+gxde (2024.09.01) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
-  * 
-  * 
 
- -- gfdgd_xi <3025613752@qq.com>  Sun, 25 Aug 2024 12:39:07 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 01 Sep 2024 08:27:49 +0800
 
 gxde (2024.03.23) stable; urgency=medium
 

debian/control

@@ -19,7 +19,10 @@ Depends: ${misc:Depends},
  gxde-sea-icon-theme,
  gxde-download,
  gxde-ocr,
- gxde-music
+ gxde-music,
+ gxde-picker,
+ gxde-font-installer,
+ deepin-movie
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -44,7 +47,6 @@ Depends: ${misc:Depends},
  dde-kwin,
  deepin-screensaver,
  gxde-default-settings,
- gxde-desktop-extra
 Recommends:
  gxde-desktop-extra,
  file-roller,

text.svg

@@ -0,0 +1,11 @@
+<svg width="2572.267578" height="429.117676" viewBox="0 0 2572.27 429.118" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<desc>
+			Created with Pixso.
+	</desc>
+	<defs/>
+	<path id="矢量 19" d="M447.94 429.11C509.47 429.11 559.86 378.72 559.86 317.2L559.86 191.22L280.07 191.22L280.07 247.18L503.9 247.18L503.9 317.2C503.9 348.55 479.59 373.16 447.94 373.16L111.91 373.16C80.27 373.16 55.95 348.55 55.95 317.2L55.95 112.2C55.95 80.56 80.27 56.25 111.91 56.25L447.94 56.25C479.59 56.25 503.9 80.56 503.9 112.2L559.86 112.2C559.86 50.39 509.47 0 447.94 0L111.91 0C50.39 0 0 50.39 0 112.2L0 317.2C0 378.72 50.39 429.11 111.91 429.11L447.94 429.11Z" fill="#000000" fill-opacity="1.000000" fill-rule="nonzero"/>
+	<path id="矢量 19" d="M1858.01 420.52C1919.53 420.52 1969.92 370.13 1969.92 308.61L1969.92 112.61C1969.92 50.8 1919.53 0.41 1858.01 0.41L1410.06 0.41L1410.06 420.52L1858.01 420.52ZM1858.01 364.57L1466.02 364.57L1466.02 56.66L1858.01 56.66C1889.65 56.66 1913.97 80.97 1913.97 112.61L1913.97 308.61C1913.97 339.96 1889.65 364.57 1858.01 364.57Z" fill="#000000" fill-opacity="1.000000" fill-rule="nonzero"/>
+	<path id="矢量 19" d="M2572.27 420.52L2572.27 364.57L2110.26 364.57L2110.26 238.59L2516.31 238.59L2516.31 182.63L2110.26 182.63L2110.26 56.66L2572.27 56.66L2572.27 0.41L2054.3 0.41L2054.3 420.52L2572.27 420.52Z" fill="#000000" fill-opacity="1.000000" fill-rule="nonzero"/>
+	<path id="矢量 19" d="M1183.73 420.11L946.12 210.05L903.94 172.85C773.27 57.71 838.6 115.43 708.23 0L623.86 0L861.75 210.05L623.86 420.11L708.23 420.11L903.94 247.26L1099.64 420.11L1183.73 420.11ZM976.2 183.47L1183.73 0L1099.64 0L934.27 146.06L976.2 183.47Z" fill="#000000" fill-opacity="1.000000" fill-rule="evenodd"/>
+	<path id="矢量 19" d="M1090.38 210.05L1327.97 420.11L1243.89 420.11L1048.18 247.26L1006 210.05L1048.18 172.85L1243.89 0L1327.97 0L1090.38 210.05Z" fill="#F24A4A" fill-opacity="1.000000" fill-rule="evenodd"/>
+</svg>

tools/build-arm-iso.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+genisoimage -e boot/grub/efi.img -no-emul-boot -R -J -T -c boot.cat -hide boot.cat -V "GXDE" -o gxde.iso ISO-temp/
+#genisoimage -r -loliet-long -V GXDE -o gxde.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -v -cache-inodes -T -eltorito-alt-boot -b boot/grub/efi.img -no-emul-boot ISO-temp/

tools/build-x86-iso.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+genisoimage -r -loliet-long -V GXDE -o gxde.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -v -cache-inodes -T -eltorito-alt-boot -b boot/grub/efi.img -no-emul-boot ISO-temp/