From e92e25d1eb7fdd0ccf76de08946e1c7c38535e16 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:45:05 +0800 Subject: [PATCH 01/13] Delete update_runtime.sh --- update_runtime.sh | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100755 update_runtime.sh diff --git a/update_runtime.sh b/update_runtime.sh deleted file mode 100755 index 995a8d3..0000000 --- a/update_runtime.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# 使用find命令递归地查找所有的软链接 -find . -type l | while read link; do - # 读取软链接的目标 - target=$(readlink "$link") - - # 检查目标是否以/opt/deepin-wine8-stable开头 - if [[ "$target" == /opt/deepin-wine8-stable/* ]]; then - # 替换路径中的/usr/deepin-wine8-stable为/runtime/deepin-wine8-stable - new_target=${target//\/opt\/deepin-wine8-stable/\/runtime\/deepin-wine8-stable} - - # 更新软链接的目标 - ln -snf "$new_target" "$link" - - # 输出更新信息 - echo "Updated link $link to point to $new_target" - fi -done \ No newline at end of file From fc1d2c9d90428de2720d5ec5f7e962c21a5b8f5e Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:44:50 +0800 Subject: [PATCH 02/13] Delete install_dep --- install_dep | 126 ---------------------------------------------------- 1 file changed, 126 deletions(-) delete mode 100644 install_dep diff --git a/install_dep b/install_dep deleted file mode 100644 index 9940a48..0000000 --- a/install_dep +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -set -e -# 文件名 deb-source.bash -# 包含要解压的deb目录 -deb_dir=$(realpath "$1") -# 将deb解压到输出目录 -target=$(realpath "$2") -# 默认会跳过base已安装的包,可以强制解压已安装的包 -include="$3" -# 临时目录,将内容处理后再移动到 target -out_dir="$(mktemp -d)" -cd "$out_dir" -# 临时文件,用于记录deb文件列表 -deb_list_file="$out_dir/deb.list" -# 临时文件,用于记录强制安装的包名 -include_list_file="$out_dir/include.packages.list" -# 临时文件,用于记录跳过安装的包名 -exclude_list_file="$out_dir/exclude.packages.list" -# 包数据存放的临时目录 -data_list_dir="$out_dir/data" -# 生成文件列表 -find "$deb_dir" -type f -name "*.deb" > "$deb_list_file" -echo "$include" | tr ',' '\n' > "$include_list_file" -# 用于记录安装的所有文件来自哪个包 -mkdir /tmp/deb-source-file || true - -# 如果base和runtime已安装则跳过,旧版本base没有/packages.list文件就使用/var/lib/dpkg/status -grep 'Package: ' /var/lib/dpkg/status > "$exclude_list_file" || true -cat /packages.list /runtime/packages.list "$PREFIX/packages.list" >> "$exclude_list_file" || true -# 在旧的base里面这些包需要强制安装,因为base中没有他们的dev包,如果dev包被安装到/opt目录,而lib包在/usr 会有问题 -echo "libarchive13,libasan5,libasm1,libbabeltrace1,libcairo-script-interpreter2,libcc1-0,libcurl4,libdpkg-perl,libdw1,libevent-2.1-6,libgdbm-compat4,libgdbm6,libgirepository-1.0-1,libgles1,libgles2,libglib2.0-data,libgmpxx4ldbl,libgnutls-dane0,libgnutls-openssl27,libgnutlsxx28,libharfbuzz-gobject0,libharfbuzz-icu0,libipt2,libisl19,libitm1,libjsoncpp1,libldap-2.4-2,libldap-common,liblsan0,liblzo2-2,libmpc3,libmpdec2,libmpfr6,libmpx2,libncurses6,libnghttp2-14,libpcrecpp0v5,libperl5.28,libpopt0,libprocps7,libpython3-stdlib,libpython3.7,libpython3.7-minimal,libpython3.7-stdlib,libquadmath0,libreadline7,librhash0,librtmp1,libsasl2-2,libsasl2-modules-db,libssh2-1,libtiffxx5,libtsan0,libubsan1,libunbound8,libuv1" | tr ',' '\n' >> "$include_list_file" - -# 遍历文件列表 -while IFS= read -r file -do - # 输出deb名,但不换行,便于在包名后面加skip - echo -n "$file" - # 提取control文件 - control_file=$(ar -t "$file" | grep control.tar) - ar -x "$file" "$control_file" - # 获取包名 - pkg=$(tar -xf "$control_file" ./control -O | grep '^Package:' | awk '{print $2}') - rm "$control_file" - # 如果在base和runtime中已安装,并且不包含在include列表则跳过安装 - if grep -q "^Package: $pkg$" "$exclude_list_file" && ! grep -q "^$pkg$" "$include_list_file"; then - echo " skip" - echo "$file" >> /tmp/deb-source-file/skip.list - else - # 否则安装到$PREFIX目录 - # 换行 - echo "" - # 查找data.tar文件,文件会因为压缩格式不同,有不同的后缀,例如data.tar.xz、data.tar.gz - data_file=$(ar -t "$file" | grep data.tar) - # 提取data.tar文件 - ar -x "$file" "$data_file" - # 解压data.tar文件到输出目录 - mkdir "$data_list_dir" - tar -xvf "$data_file" -C "$data_list_dir" >> "/tmp/deb-source-file/$(basename "$file").list" - rm "$data_file" - - # 清理不需要复制的目录 - rm -r "${data_list_dir:?}/usr/share/applications"* 2>/dev/null || true - # 修改pc文件的prefix - sed -i "s#/usr#$PREFIX#g" "$data_list_dir"/usr/lib/"$TRIPLET"/pkgconfig/*.pc 2>/dev/null|| true - sed -i "s#/usr#$PREFIX#g" "$data_list_dir"/usr/share/pkgconfig/*.pc 2>/dev/null || true - # 修改指向/lib的绝对路径的软链接 - find "$data_list_dir" -type l | while IFS= read -r file; do - linkTarget=$(readlink "$file") - # 如果指向的路径以/lib开头,并且文件不存在,则添加 /runtime 前缀 - # 部分 dev 包会创建 so 文件的绝对链接指向 /lib 目录下 - if echo "$linkTarget" | grep -q ^/lib && ! [ -f "$linkTarget" ]; then - ln -sf "$target$linkTarget" "$file" - echo " FIX LINK" "$linkTarget" "=>" "$target$linkTarget" - fi - done - # 修复动态库的RUNPATH - find "$data_list_dir" -type f -exec file {} \; | grep 'shared object' | awk -F: '{print $1}' | while IFS= read -r file; do - runpath=$(readelf -d "$file" | grep RUNPATH | awk '{print $NF}') - # 如果RUNPATH使用绝对路径,则添加/runtime前缀 - if echo "$runpath" | grep -q '^\[/'; then - runpath=${runpath#[} - runpath=${runpath%]} - newRunpath=${runpath//usr\/lib/runtime\/lib} - newRunpath=${newRunpath//usr/runtime} - patchelf --set-rpath "$newRunpath" "$file" - echo " FIX RUNPATH" "$file" "$runpath" "=>" "$newRunpath" - fi - done - # 复制/lib,/bin,/usr目录 - cp -rP "$data_list_dir/lib" "$target" 2>/dev/null|| true - cp -rP "$data_list_dir/bin" "$target" 2>/dev/null|| true - cp -rP "$data_list_dir"/usr/* "$target" || true - rm -r "$data_list_dir" - - fi; -done < "$deb_list_file" - - -# 修复相对路径的软链接(dev包内的软连接尝试修复指向base) -find "$target" -type l | while IFS= read -r file; do - # 获取链接的绝对路径 - linkTarget=$(readlink -m "$file") - # 如果链接指向的文件不存在 - if [ ! -e "$linkTarget" ]; then - # 去掉前缀查看/lib下是否存在 - linkTarget="${linkTarget#$target}" - if [ -e "$linkTarget" ]; then - ln -sf "$linkTarget" "$file" - echo " FIX LINK" "$file" "=>" "$target$linkTarget" - fi - # 添加usr前缀查看/usr/lib下是否存在 - linkTarget="/usr$target" - if [ -e "$linkTarget" ]; then - ln -sf "$target$linkTarget" "$file" - echo " FIX LINK" "$file" "=>" "$target$linkTarget" - fi - fi -done - -# 更新ld.so.cache -if [ -n "$LINGLONG_LD_SO_CACHE" ]; then - ldconfig -C "$LINGLONG_LD_SO_CACHE" -fi - -# 清理临时目录 -rm -r "$out_dir" \ No newline at end of file From 92ba2b64ed94c93a58a64e9c20e78d6fe86b5115 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:25:02 +0800 Subject: [PATCH 03/13] Create workflows.yml --- .obs/workflows.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .obs/workflows.yml diff --git a/.obs/workflows.yml b/.obs/workflows.yml new file mode 100644 index 0000000..11ff3b9 --- /dev/null +++ b/.obs/workflows.yml @@ -0,0 +1,69 @@ +# OBS 构建工作流 +## PR构建 +test_build: + filters: + event: pull_request + steps: + # x86_64构建 + - branch_package: + source_project: linglong:app + source_package: template_CI + target_project: linglong:app:CI:amd64 + target_package: %{SCM_REPOSITORY_NAME} + - set_flags: + flags: + - type: build + status: enable + project: linglong:app:CI:amd64 + - type: publish + status: enable + project: linglong:app:CI:amd64 + - configure_repositories: + project: linglong:app:CI:amd64 + repositories: + - name: deepin_23_repo + paths: + - target_project: linglong:app:CI + target_repository: deepin_23_repo + architectures: + - x86_64 + + # aarch64构建 + - branch_package: + source_project: linglong:app + source_package: template_CI_aarch64 + target_project: linglong:app:CI:aarch64 + target_package: %{SCM_REPOSITORY_NAME} + - set_flags: + flags: + - type: build + status: enable + project: linglong:app:CI:aarch64 + - type: publish + status: enable + project: linglong:app:CI:aarch64 + - configure_repositories: + project: linglong:app:CI:aarch64 + repositories: + - name: deepin_23_repo + paths: + - target_project: linglong:app:CI + target_repository: deepin_23_repo + architectures: + - aarch64 + +## TAG构建 +commit_build: + filters: + event: tag_push + steps: + - branch_package: + source_project: linglong:app + source_package: template_CI + target_project: linglong:app:stable:amd64 + target_package: %{SCM_REPOSITORY_NAME} + - branch_package: + source_project: linglong:app + source_package: template_CI_aarch64 + target_project: linglong:app:stable:aarch64 + target_package: %{SCM_REPOSITORY_NAME} From 56c26daa797cdc229b8ee2b000504f29a5b9efde Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:01:01 +0800 Subject: [PATCH 04/13] Delete linglong.yaml --- linglong.yaml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml deleted file mode 100644 index 23878fb..0000000 --- a/linglong.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "1" - -package: - id: com.qq.weixin.work.deepin - name: com.qq.weixin.work.deepin - version: 4.1.22.6016 - kind: app - description: | - convert from 4.1.22.6016deepin12 Tencent WXWork Client on Deepin Wine - -base: org.deepin.base.wine/23.1.0 - -command: - - /opt/apps/com.qq.weixin.work.deepin/files/run.sh - -sources: - - kind: file - url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIwMjQtMDgtMjEgMTQ6NTU6MjA/pool/non-free/c/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.22.6016deepin12_amd64.deb - digest: e210a220528ac53fc6856ec3f4a0fc981e296b87d93ffbfb456c5775ebf73c48 - -build: | - set -x - SOURCES="linglong/sources" - dpkg-deb -x $SOURCES/com.qq.weixin.work.deepin_4.1.22.6016deepin12_amd64.deb $SOURCES/com.qq.weixin.work.deepin - install -d $PREFIX/share - install -d $PREFIX/bin - # move files - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX - From b608244a622fcff4dba2fac2f3c3d34d938f4df5 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:01:42 +0800 Subject: [PATCH 05/13] Add files via upload --- linglong.yaml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml new file mode 100644 index 0000000..bfdb29e --- /dev/null +++ b/linglong.yaml @@ -0,0 +1,54 @@ +version: "1" + +package: + id: com.qq.weixin.work.deepin + name: com.qq.weixin.work.deepin + version: 4.1.22.6009 + kind: app + description: | + convert from 4.1.22.6009deepin14 Tencent WXWork Client on Deepin Wine + +base: org.deepin.base.wine +runtime: org.deepin.runtime.wine + +command: + - /opt/apps/com.qq.weixin.work.deepin/files/run.sh + +sources: + - kind: file + url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.22.6009deepin14_amd64.deb + digest: 478a89e36ed3356eb6ef3180f45ccbb57e39db8aae862d70210837c377eab0e7 + +build: | + set -x + SOURCES="linglong/sources" + dpkg-deb -x $SOURCES/com.qq.weixin.work.deepin_4.1.22.6009deepin14_amd64.deb $SOURCES/com.qq.weixin.work.deepin + # run.sh替换 + FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" + sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ + -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ + -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ + -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ + -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" + + + # 遍历数组中的每个文件路径 + for file in "${files_to_delete[@]}"; do + # 检查文件是否存在 + if [ -f "$file" ]; then + rm -rf "$file" + if [ $? -eq 0 ]; then + echo "$file deleted successfully." + else + echo "Failed to delete $file." + fi + else + echo "$file does not exist." + fi + done + install -d $PREFIX/share + install -d $PREFIX/bin + # move files + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX + From 37accbe0262cfe2637ba301680f8c8f18785d33d Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:02:17 +0800 Subject: [PATCH 06/13] Delete linglong.yaml --- linglong.yaml | 54 --------------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml deleted file mode 100644 index bfdb29e..0000000 --- a/linglong.yaml +++ /dev/null @@ -1,54 +0,0 @@ -version: "1" - -package: - id: com.qq.weixin.work.deepin - name: com.qq.weixin.work.deepin - version: 4.1.22.6009 - kind: app - description: | - convert from 4.1.22.6009deepin14 Tencent WXWork Client on Deepin Wine - -base: org.deepin.base.wine -runtime: org.deepin.runtime.wine - -command: - - /opt/apps/com.qq.weixin.work.deepin/files/run.sh - -sources: - - kind: file - url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.22.6009deepin14_amd64.deb - digest: 478a89e36ed3356eb6ef3180f45ccbb57e39db8aae862d70210837c377eab0e7 - -build: | - set -x - SOURCES="linglong/sources" - dpkg-deb -x $SOURCES/com.qq.weixin.work.deepin_4.1.22.6009deepin14_amd64.deb $SOURCES/com.qq.weixin.work.deepin - # run.sh替换 - FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" - sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ - -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ - -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ - -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ - -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" - - - # 遍历数组中的每个文件路径 - for file in "${files_to_delete[@]}"; do - # 检查文件是否存在 - if [ -f "$file" ]; then - rm -rf "$file" - if [ $? -eq 0 ]; then - echo "$file deleted successfully." - else - echo "Failed to delete $file." - fi - else - echo "$file does not exist." - fi - done - install -d $PREFIX/share - install -d $PREFIX/bin - # move files - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX - From 98f2979d94c97b24e6f66e5a017c5d3262396c9f Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:05:22 +0800 Subject: [PATCH 07/13] Add files via upload --- linglong.yaml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml new file mode 100644 index 0000000..47b1c7c --- /dev/null +++ b/linglong.yaml @@ -0,0 +1,53 @@ +version: "1" + +package: + id: com.qq.weixin.work.deepin + name: com.qq.weixin.work.deepin + version: 4.1.22.6009 + kind: app + description: | + convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine + +base: org.deepin.base.wine +runtime: org.deepin.runtime.wine + +command: + - /opt/apps/com.qq.weixin.work.deepin/files/run.sh + +sources: + - kind: file + url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb + digest: 59e82289951dfbb16da6a15f3780c85c851e454d7a924d71713504ca43073380 + +build: | + set -x + SOURCES="linglong/sources" + dpkg-deb -x $SOURCES/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb $SOURCES/com.qq.weixin.work.deepin + # run.sh替换 + FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" + sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ + -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ + -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ + -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ + -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" + + # 遍历数组中的每个文件路径 + for file in "${files_to_delete[@]}"; do + # 检查文件是否存在 + if [ -f "$file" ]; then + rm -rf "$file" + if [ $? -eq 0 ]; then + echo "$file deleted successfully." + else + echo "Failed to delete $file." + fi + else + echo "$file does not exist." + fi + done + install -d $PREFIX/share + install -d $PREFIX/bin + # move files + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX + From 9a51a0a7e413a8f033376c16327dcd17dbb7c321 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:17:34 +0800 Subject: [PATCH 08/13] Delete linglong.yaml --- linglong.yaml | 53 --------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml deleted file mode 100644 index 47b1c7c..0000000 --- a/linglong.yaml +++ /dev/null @@ -1,53 +0,0 @@ -version: "1" - -package: - id: com.qq.weixin.work.deepin - name: com.qq.weixin.work.deepin - version: 4.1.22.6009 - kind: app - description: | - convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine - -base: org.deepin.base.wine -runtime: org.deepin.runtime.wine - -command: - - /opt/apps/com.qq.weixin.work.deepin/files/run.sh - -sources: - - kind: file - url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb - digest: 59e82289951dfbb16da6a15f3780c85c851e454d7a924d71713504ca43073380 - -build: | - set -x - SOURCES="linglong/sources" - dpkg-deb -x $SOURCES/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb $SOURCES/com.qq.weixin.work.deepin - # run.sh替换 - FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" - sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ - -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ - -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ - -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ - -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" - - # 遍历数组中的每个文件路径 - for file in "${files_to_delete[@]}"; do - # 检查文件是否存在 - if [ -f "$file" ]; then - rm -rf "$file" - if [ $? -eq 0 ]; then - echo "$file deleted successfully." - else - echo "Failed to delete $file." - fi - else - echo "$file does not exist." - fi - done - install -d $PREFIX/share - install -d $PREFIX/bin - # move files - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share - cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX - From 0b06449f3508acb6c1fc0a6caaabf4ca83869081 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:18:06 +0800 Subject: [PATCH 09/13] Add files via upload --- linglong.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 linglong.yaml diff --git a/linglong.yaml b/linglong.yaml new file mode 100644 index 0000000..9befa38 --- /dev/null +++ b/linglong.yaml @@ -0,0 +1,39 @@ +version: "1" + +package: + id: com.qq.weixin.work.deepin + name: com.qq.weixin.work.deepin + version: 4.1.22.6009 + kind: app + description: | + convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine + +base: org.deepin.base.wine +runtime: org.deepin.runtime.wine + +command: + - /opt/apps/com.qq.weixin.work.deepin/files/run.sh + +sources: + - kind: file + url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb + digest: 59e82289951dfbb16da6a15f3780c85c851e454d7a924d71713504ca43073380 + +build: | + set -x + SOURCES="linglong/sources" + dpkg-deb -x $SOURCES/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb $SOURCES/com.qq.weixin.work.deepin + # run.sh替换 + FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" + sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ + -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ + -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ + -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ + -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" + + install -d $PREFIX/share + install -d $PREFIX/bin + # move files + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX + From 8fc9d28cc7db029817bfbcc7bde1142b8e9b727e Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:54:05 +0800 Subject: [PATCH 10/13] Update linglong.yaml --- linglong.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linglong.yaml b/linglong.yaml index 9befa38..e34446e 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -8,8 +8,8 @@ package: description: | convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine -base: org.deepin.base.wine -runtime: org.deepin.runtime.wine +base: org.deepin.base.wine/23.2.0.3 +runtime: org.deepin.runtime.wine/23.2.1.3 command: - /opt/apps/com.qq.weixin.work.deepin/files/run.sh From b4a07a831caf27b091377136eaf244ec86ba8b62 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:33:27 +0800 Subject: [PATCH 11/13] Update linglong.yaml --- linglong.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linglong.yaml b/linglong.yaml index e34446e..3945d50 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -8,21 +8,21 @@ package: description: | convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine -base: org.deepin.base.wine/23.2.0.3 -runtime: org.deepin.runtime.wine/23.2.1.3 +base: org.deepin.base.wine/23.2.0.5 +runtime: org.deepin.runtime.wine/23.2.1.4 command: - /opt/apps/com.qq.weixin.work.deepin/files/run.sh sources: - kind: file - url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb - digest: 59e82289951dfbb16da6a15f3780c85c851e454d7a924d71713504ca43073380 + url: https://aptly.uniontech.com/pkg/nonfree-eagle/release-candidate/d2luZTgtcnVudGltZTIyMDI0LTA5LTAzIDEzOjE1OjAx/pool/non-free/c/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.22.6009deepin17_amd64.deb + digest: 32c648f56dae3ef698958f4fcc774b061aeb3d46b6fa0eaa29e3d4e9b4f64954 build: | set -x SOURCES="linglong/sources" - dpkg-deb -x $SOURCES/signed_com.qq.weixin.work.deepin_4.1.22.6009deepin15_amd64.deb $SOURCES/com.qq.weixin.work.deepin + dpkg-deb -x $SOURCES/com.qq.weixin.work.deepin_4.1.22.6009deepin17_amd64.deb $SOURCES/com.qq.weixin.work.deepin # run.sh替换 FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ From 3e0a11a8fdf541c548b84c20e8f80b36f2394ccb Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:56:13 +0800 Subject: [PATCH 12/13] Update linglong.yaml --- linglong.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/linglong.yaml b/linglong.yaml index 3945d50..3b8404b 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -3,10 +3,10 @@ version: "1" package: id: com.qq.weixin.work.deepin name: com.qq.weixin.work.deepin - version: 4.1.22.6009 + version: 1.0.0.0 kind: app description: | - convert from 4.1.22.6009deepin15 Tencent WXWork Client on Deepin Wine + convert from 4.1.22.6009deepin17 Tencent WXWork Client on Deepin Wine base: org.deepin.base.wine/23.2.0.5 runtime: org.deepin.runtime.wine/23.2.1.4 @@ -36,4 +36,3 @@ build: | # move files cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX - From 767a6ba6a47758ac63e38d67d52cf100735d8987 Mon Sep 17 00:00:00 2001 From: PeakVue <129737754+PeakVue@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:48:39 +0800 Subject: [PATCH 13/13] Create linglong.yaml add arm64 wxwork --- arm64/linglong.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 arm64/linglong.yaml diff --git a/arm64/linglong.yaml b/arm64/linglong.yaml new file mode 100644 index 0000000..4c83ef0 --- /dev/null +++ b/arm64/linglong.yaml @@ -0,0 +1,36 @@ +version: "1" + +package: + id: com.qq.weixin.work.deepin + name: com.qq.weixin.work.deepin + version: 1.0.0.0 + kind: app + description: | + convert from 4.1.22.6009deepin10 Tencent WXWork Client on Deepin Wine + +base: org.deepin.base.wine/23.0.0/arm64 +runtime: org.deepin.runtime.wine/23.0.0/arm64 + +command: + - /opt/apps/com.qq.weixin.work.deepin/files/run.sh + +build: | + set -x + SOURCES="linglong/sources" + rm -rf linglong/sources + mkdir linglong/sources + cp com.qq.weixin.work.deepin_4.1.22.6009deepin10_arm64.deb linglong/sources + dpkg-deb -x $SOURCES/com.qq.weixin.work.deepin_4.1.22.6009deepin10_arm64.deb $SOURCES/com.qq.weixin.work.deepin + # run.sh替换 + FILE_PATH="$SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/run.sh" + sed -i -e 's|/opt/deepin-wine8-stable|/runtime/deepin-wine8-stable|g' \ + -e 's|/opt/deepin-wine6-stable|/runtime/deepin-wine6-stable|g' \ + -e 's|/opt/deepinwine|/runtime/deepinwine|g' \ + -e 's|/opt/deepin-box86|/runtime/deepin-box86|g' \ + -e 's|BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"|BOTTLEPATH="$HOME/.linglong/$BOTTLENAME"|g' "$FILE_PATH" + + install -d $PREFIX/share + install -d $PREFIX/bin + # move files + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/entries/* $PREFIX/share + cp -r $SOURCES/com.qq.weixin.work.deepin/opt/apps/com.qq.weixin.work.deepin/files/* $PREFIX